<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8517] trunk/src/bp-activity/bp-activity-functions.php: Don't use extract() in bp_activity_get()</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8517">8517</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-06-14 19:38:31 +0000 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use extract() in bp_activity_get()
See <a href="http://buddypress.trac.wordpress.org/ticket/5698">#5698</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-functions.php (8516 => 8517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-functions.php 2014-06-14 19:09:54 UTC (rev 8516)
+++ trunk/src/bp-activity/bp-activity-functions.php 2014-06-14 19:38:31 UTC (rev 8517)
</span><span class="lines">@@ -978,24 +978,23 @@
</span><span class="cx"> 'filter' => array()
</span><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r, EXTR_SKIP );
</del><span class="cx">
</span><span class="cx"> // Attempt to return a cached copy of the first page of sitewide activity.
</span><del>- if ( 1 == (int) $page && empty( $max ) && empty( $search_terms ) && empty( $meta_query ) && empty( $filter ) && empty( $exclude ) && empty( $in ) && 'DESC' == $sort && empty( $exclude ) && 'ham_only' == $spam ) {
</del><ins>+ if ( 1 == (int) $r['page'] && empty( $r['max'] ) && empty( $r['search_terms'] ) && empty( $r['meta_query'] ) && empty( $r['filter'] ) && empty( $r['exclude'] ) && empty( $r['in'] ) && 'DESC' == $r['sort'] && empty( $r['exclude'] ) && 'ham_only' == $r['spam'] ) {
</ins><span class="cx"> if ( !$activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' ) ) {
</span><span class="cx"> $args = array(
</span><del>- 'page' => $page,
- 'per_page' => $per_page,
- 'max' => $max,
- 'sort' => $sort,
- 'search_terms' => $search_terms,
- 'meta_query' => $meta_query,
- 'filter' => $filter,
- 'display_comments' => $display_comments,
- 'show_hidden' => $show_hidden,
- 'spam' => $spam,
- 'update_meta_cache' => $update_meta_cache,
- 'count_total' => $count_total,
</del><ins>+ 'page' => $r['page'],
+ 'per_page' => $r['per_page'],
+ 'max' => $r['max'],
+ 'sort' => $r['sort'],
+ 'search_terms' => $r['search_terms'],
+ 'meta_query' => $r['meta_query'],
+ 'filter' => $r['filter'],
+ 'display_comments' => $r['display_comments'],
+ 'show_hidden' => $r['show_hidden'],
+ 'spam' => $r['spam'],
+ 'update_meta_cache' => $r['update_meta_cache'],
+ 'count_total' => $r['count_total'],
</ins><span class="cx"> );
</span><span class="cx"> $activity = BP_Activity_Activity::get( $args );
</span><span class="cx"> wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp' );
</span><span class="lines">@@ -1003,19 +1002,19 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> $args = array(
</span><del>- 'page' => $page,
- 'per_page' => $per_page,
- 'max' => $max,
- 'sort' => $sort,
- 'search_terms' => $search_terms,
- 'meta_query' => $meta_query,
- 'filter' => $filter,
- 'display_comments' => $display_comments,
- 'show_hidden' => $show_hidden,
- 'exclude' => $exclude,
- 'in' => $in,
- 'spam' => $spam,
- 'count_total' => $count_total,
</del><ins>+ 'page' => $r['page'],
+ 'per_page' => $r['per_page'],
+ 'max' => $r['max'],
+ 'sort' => $r['sort'],
+ 'search_terms' => $r['search_terms'],
+ 'meta_query' => $r['meta_query'],
+ 'filter' => $r['filter'],
+ 'display_comments' => $r['display_comments'],
+ 'show_hidden' => $r['show_hidden'],
+ 'exclude' => $r['exclude'],
+ 'in' => $r['in'],
+ 'spam' => $r['spam'],
+ 'count_total' => $r['count_total'],
</ins><span class="cx"> );
</span><span class="cx"> $activity = BP_Activity_Activity::get( $args );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>