<!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] [3345] trunk/bp-activity/bp-activity-classes.php: fixes #2098,
IN operator is better than OR</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3345</dd>
<dt>Author</dt> <dd>mrmaz</dd>
<dt>Date</dt> <dd>2010-11-03 22:54:05 +0000 (Wed, 03 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixes #2098, IN operator is better than OR</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 (3344 => 3345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-11-03 22:34:39 UTC (rev 3344)
+++ trunk/bp-activity/bp-activity-classes.php 2010-11-03 22:54:05 UTC (rev 3345)
</span><span class="lines">@@ -436,85 +436,61 @@
</span><span class="cx"> return $activity_feed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_filter_sql( $filter_array ) {
</del><ins>+ function get_in_operator_sql( $field, $items ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( !empty( $filter_array['user_id'] ) ) {
- $user_filter = explode( ',', $filter_array['user_id'] );
- $user_sql = ' ( a.user_id IN ( ' . $filter_array['user_id'] . ' ) )';
- $filter_sql[] = $user_sql;
</del><ins>+ // split items at the comma
+ $items_dirty = explode( ',', $items );
+
+ // array of prepared integers or quoted strings
+ $items_prepared = array();
+
+ // clean up and format each item
+ foreach ( $items_dirty as $item ) {
+ // clean up the string
+ $item = trim( $item );
+ // pass everything through prepare for security and to safely quote strings
+ $items_prepared[] = ( is_numeric( $item ) ) ? $wpdb->prepare( '%d', $item ) : $wpdb->prepare( '%s', $item );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $filter_array['object'] ) ) {
- $object_filter = explode( ',', $filter_array['object'] );
- $object_sql = ' ( ';
</del><ins>+ // build IN operator sql syntax
+ if ( count( $items_prepared ) )
+ return sprintf( '%s IN ( %s )', trim( $field ), implode( ',', $items_prepared ) );
+ else
+ return false;
+ }
</ins><span class="cx">
</span><del>- $counter = 1;
- foreach( (array) $object_filter as $object ) {
- $object_sql .= $wpdb->prepare( "a.component = %s", trim( $object ) );
</del><ins>+ function get_filter_sql( $filter_array ) {
+ global $wpdb;
</ins><span class="cx">
</span><del>- if ( $counter != count( $object_filter ) )
- $object_sql .= ' || ';
</del><ins>+ if ( !empty( $filter_array['user_id'] ) ) {
+ $user_sql = BP_Activity_Activity::get_in_operator_sql( 'a.user_id', $filter_array['user_id'] );
+ if ( !empty( $user_sql ) )
+ $filter_sql[] = $user_sql;
+ }
</ins><span class="cx">
</span><del>- $counter++;
- }
-
- $object_sql .= ' )';
- $filter_sql[] = $object_sql;
</del><ins>+ if ( !empty( $filter_array['object'] ) ) {
+ $object_sql = BP_Activity_Activity::get_in_operator_sql( 'a.component', $filter_array['object'] );
+ if ( !empty( $object_sql ) )
+ $filter_sql[] = $object_sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $filter_array['action'] ) ) {
</span><del>- $action_filter = explode( ',', $filter_array['action'] );
- $action_sql = ' ( ';
-
- $counter = 1;
- foreach( (array) $action_filter as $action ) {
- $action_sql .= $wpdb->prepare( "a.type = %s", trim( $action ) );
-
- if ( $counter != count( $action_filter ) )
- $action_sql .= ' || ';
-
- $counter++;
- }
-
- $action_sql .= ' )';
- $filter_sql[] = $action_sql;
</del><ins>+ $action_sql = BP_Activity_Activity::get_in_operator_sql( 'a.type', $filter_array['action'] );
+ if ( !empty( $action_sql ) )
+ $filter_sql[] = $action_sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $filter_array['primary_id'] ) ) {
</span><del>- $pid_filter = explode( ',', $filter_array['primary_id'] );
- $pid_sql = ' ( ';
-
- $counter = 1;
- foreach( (array) $pid_filter as $pid ) {
- $pid_sql .= $wpdb->prepare( "a.item_id = %s", trim( $pid ) );
-
- if ( $counter != count( $pid_filter ) )
- $pid_sql .= ' || ';
-
- $counter++;
- }
-
- $pid_sql .= ' )';
- $filter_sql[] = $pid_sql;
</del><ins>+ $pid_sql = BP_Activity_Activity::get_in_operator_sql( 'a.item_id', $filter_array['primary_id'] );
+ if ( !empty( $pid_sql ) )
+ $filter_sql[] = $pid_sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $filter_array['secondary_id'] ) ) {
</span><del>- $sid_filter = explode( ',', $filter_array['secondary_id'] );
- $sid_sql = ' ( ';
-
- $counter = 1;
- foreach( (array) $sid_filter as $sid ) {
- $sid_sql .= $wpdb->prepare( "a.secondary_item_id = %s", trim( $sid ) );
-
- if ( $counter != count( $sid_filter ) )
- $sid_sql .= ' || ';
-
- $counter++;
- }
-
- $sid_sql .= ' )';
- $filter_sql[] = $sid_sql;
</del><ins>+ $sid_sql = BP_Activity_Activity::get_in_operator_sql( 'a.secondary_item_id', $filter_array['secondary_id'] );
+ if ( !empty( $sid_sql ) )
+ $filter_sql[] = $sid_sql;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty($filter_sql) )
</span></span></pre>
</div>
</div>
</body>
</html>