<!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][9213] trunk/src/bp-activity/bp-activity-classes.php: Don't use `extract()` in `BP_Activity_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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9213">9213</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9213","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-04 20:00:17 +0000 (Thu, 04 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Don't use `extract()` in `BP_Activity_Activity::get()`.
Props r-a-y.
See <a href="http://buddypress.trac.wordpress.org/ticket/5698">#5698</a>, <a href="http://buddypress.trac.wordpress.org/ticket/4988">#4988</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityclassesphp">trunk/src/bp-activity/bp-activity-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-classes.php 2014-12-04 19:14:47 UTC (rev 9212)
+++ trunk/src/bp-activity/bp-activity-classes.php 2014-12-04 20:00:17 UTC (rev 9213)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'count_total' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- extract( $r );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Select conditions
</span><span class="cx" style="display: block; padding: 0 10px"> $select_sql = "SELECT DISTINCT a.id";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,44 +350,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Excluded types
</span><span class="cx" style="display: block; padding: 0 10px"> $excluded_types = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Regular filtering
+ if ( $r['filter'] && $filter_sql = BP_Activity_Activity::get_filter_sql( $r['filter'] ) ) {
+ $where_conditions['filter_sql'] = $filter_sql;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Spam
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ham_only' == $spam )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ham_only' == $r['spam'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['spam_sql'] = 'a.is_spam = 0';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'spam_only' == $spam )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'spam_only' == $r['spam'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['spam_sql'] = 'a.is_spam = 1';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Searching
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $search_terms ) {
- $search_terms_like = '%' . bp_esc_like( $search_terms ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $r['search_terms'] ) {
+ $search_terms_like = '%' . bp_esc_like( $r['search_terms'] ) . '%';
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['search_sql'] = $wpdb->prepare( 'a.content LIKE %s', $search_terms_like );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Filtering
- if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
- $where_conditions['filter_sql'] = $filter_sql;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Sorting
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $sort != 'ASC' && $sort != 'DESC' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sort = $r['sort'];
+ if ( $sort != 'ASC' && $sort != 'DESC' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sort = 'DESC';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide Hidden Items?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$show_hidden )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $r['show_hidden'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exclude specified items
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $exclude ) ) {
- $exclude = implode( ',', wp_parse_id_list( $exclude ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $r['exclude'] ) ) {
+ $exclude = implode( ',', wp_parse_id_list( $r['exclude'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The specific ids to which you want to limit the query
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $in ) ) {
- $in = implode( ',', wp_parse_id_list( $in ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $r['in'] ) ) {
+ $in = implode( ',', wp_parse_id_list( $r['in'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['in'] = "a.id IN ({$in})";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Process meta_query into SQL
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_query_sql = self::get_meta_query_sql( $meta_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta_query_sql['join'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join_sql .= $meta_query_sql['join'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Process date_query into SQL
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $date_query_sql = self::get_date_query_sql( $date_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_query_sql = self::get_date_query_sql( $r['date_query'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $date_query_sql ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where_conditions['date'] = $date_query_sql;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,13 +411,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Alter the query based on whether we want to show activity item
</span><span class="cx" style="display: block; padding: 0 10px"> // comments in the stream like normal comments or threaded below
</span><span class="cx" style="display: block; padding: 0 10px"> // the activity.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $display_comments || 'threaded' === $display_comments ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $r['display_comments'] || 'threaded' === $r['display_comments'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $excluded_types[] = 'activity_comment';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exclude 'last_activity' items unless the 'action' filter has
</span><span class="cx" style="display: block; padding: 0 10px"> // been explicitly set
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $filter['object'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $r['filter']['object'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $excluded_types[] = 'last_activity';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -468,8 +471,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitize page and per_page parameters
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page = absint( $page );
- $per_page = absint( $per_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page = absint( $r['page'] );
+ $per_page = absint( $r['per_page'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activities' => null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,12 +562,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_ids[] = $activity->id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $activity_ids ) && $update_meta_cache ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $activity_ids ) && $r['update_meta_cache'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_activity_update_meta_cache( $activity_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $activities && $display_comments )
- $activities = BP_Activity_Activity::append_comments( $activities, $spam );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $activities && $r['display_comments'] ) {
+ $activities = BP_Activity_Activity::append_comments( $activities, $r['spam'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pre-fetch data associated with activity users and other objects
</span><span class="cx" style="display: block; padding: 0 10px"> BP_Activity_Activity::prefetch_object_data( $activities );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,9 +593,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', "SELECT count(DISTINCT a.id) FROM {$bp->activity->table_name} a {$join_sql} {$where_sql}", $where_sql, $sort );
</span><span class="cx" style="display: block; padding: 0 10px"> $total_activities = $wpdb->get_var( $total_activities_sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $max ) ) {
- if ( (int) $total_activities > (int) $max )
- $total_activities = $max;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !empty( $r['max'] ) ) {
+ if ( (int) $total_activities > (int) $r['max'] )
+ $total_activities = $r['max'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['total'] = $total_activities;
</span></span></pre>
</div>
</div>
</body>
</html>