<!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][6498] trunk/bp-activity/bp-activity-classes.php: Remove more unneeded prepare() calls in bp-activity-classes.php.</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, #logmsg > ol { margin-left: 0; 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/6498">6498</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-11-09 13:57:34 +0000 (Fri, 09 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove more unneeded prepare() calls in bp-activity-classes.php. See <a href="http://buddypress.trac.wordpress.org/ticket/4654">#4654</a></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 (6497 => 6498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php        2012-11-08 19:37:09 UTC (rev 6497)
+++ trunk/bp-activity/bp-activity-classes.php        2012-11-09 13:57:34 UTC (rev 6498)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( !empty( $the_index ) ) {
</span><del>-                        $index_hint_sql = $wpdb-&gt;prepare( &quot;USE INDEX ({$the_index})&quot; );
</del><ins>+                        $index_hint_sql = &quot;USE INDEX ({$the_index})&quot;;
</ins><span class="cx">                 } else {
</span><span class="cx">                         $index_hint_sql = '';
</span><span class="cx">                 }
</span><span class="lines">@@ -228,12 +228,12 @@
</span><span class="cx">                         $per_page = absint( $per_page );
</span><span class="cx"> 
</span><span class="cx">                         $pag_sql    = $wpdb-&gt;prepare( &quot;LIMIT %d, %d&quot;, absint( ( $page - 1 ) * $per_page ), $per_page );
</span><del>-                        $activities = $wpdb-&gt;get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb-&gt;prepare( &quot;{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}&quot; ), $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</del><ins>+                        $activities = $wpdb-&gt;get_results( apply_filters( 'bp_activity_get_user_join_filter', &quot;{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}&quot;, $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
</ins><span class="cx">                 } else {
</span><del>-                        $activities = $wpdb-&gt;get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb-&gt;prepare( &quot;{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}&quot; ), $select_sql, $from_sql, $where_sql, $sort ) );
</del><ins>+                        $activities = $wpdb-&gt;get_results( apply_filters( 'bp_activity_get_user_join_filter', &quot;{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}&quot;, $select_sql, $from_sql, $where_sql, $sort ) );
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', $wpdb-&gt;prepare( &quot;SELECT count(a.id) FROM {$bp-&gt;activity-&gt;table_name} a {$index_hint_sql} {$where_sql} ORDER BY a.date_recorded {$sort}&quot; ), $where_sql, $sort );
</del><ins>+                $total_activities_sql = apply_filters( 'bp_activity_total_activities_sql', &quot;SELECT count(a.id) FROM {$bp-&gt;activity-&gt;table_name} a {$index_hint_sql} {$where_sql} ORDER BY a.date_recorded {$sort}&quot;, $where_sql, $sort );
</ins><span class="cx"> 
</span><span class="cx">                 $total_activities = $wpdb-&gt;get_var( $total_activities_sql );
</span><span class="cx"> 
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> 
</span><span class="cx">                         $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) );
</span><span class="cx">                         if ( !empty( $activity_user_ids ) ) {
</span><del>-                                if ( $names = $wpdb-&gt;get_results( $wpdb-&gt;prepare( &quot;SELECT user_id, value AS user_fullname FROM {$bp-&gt;profile-&gt;table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})&quot; ) ) ) {
</del><ins>+                                if ( $names = $wpdb-&gt;get_results( &quot;SELECT user_id, value AS user_fullname FROM {$bp-&gt;profile-&gt;table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})&quot; ) ) {
</ins><span class="cx">                                         foreach ( (array) $names as $name )
</span><span class="cx">                                                 $tmp_names[$name-&gt;user_id] = $name-&gt;user_fullname;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>