<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2686] trunk/bp-activity/bp-activity-classes.php: Use IN,
not multiple ORs for activity stream queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2686</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-11 20:00:16 +0000 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use IN, not multiple ORs for activity stream queries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2685 => 2686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-02-11 17:31:30 UTC (rev 2685)
+++ trunk/bp-activity/bp-activity-classes.php 2010-02-11 20:00:16 UTC (rev 2686)
</span><span class="lines">@@ -97,9 +97,6 @@
</span><span class="cx"> /* Where conditions */
</span><span class="cx"> $where_conditions = array();
</span><span class="cx">
</span><del>- if ( $per_page && $page )
- $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
-
</del><span class="cx"> /* Searching */
</span><span class="cx"> if ( $search_terms ) {
</span><span class="cx"> $search_terms = $wpdb->escape( $search_terms );
</span><span class="lines">@@ -125,9 +122,10 @@
</span><span class="cx">
</span><span class="cx"> $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
</span><span class="cx">
</span><del>- if ( $per_page && $page )
</del><ins>+ if ( $per_page && $page ) {
+ $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
</ins><span class="cx"> $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
</span><del>- else
</del><ins>+ } else
</ins><span class="cx"> $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
</span><span class="cx">
</span><span class="cx"> $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
</span><span class="lines">@@ -439,19 +437,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $filter_array['user_id'] ) ) {
</span><span class="cx"> $user_filter = explode( ',', $filter_array['user_id'] );
</span><del>- $user_sql = ' ( ';
-
- $counter = 1;
- foreach( (array) $user_filter as $user ) {
- $user_sql .= $wpdb->prepare( "a.user_id = %d", trim( $user ) );
-
- if ( $counter != count( $user_filter ) )
- $user_sql .= ' || ';
-
- $counter++;
- }
-
- $user_sql .= ' )';
</del><ins>+ $user_sql = ' ( a.user_id IN ( ' . $filter_array['user_id'] . ' ) )';
</ins><span class="cx"> $filter_sql[] = $user_sql;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>