<!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][6497] trunk/bp-messages/bp-messages-classes.php: Remove incorrect prepare() usages in bp-messages-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/6497">6497</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-11-08 19:37:09 +0000 (Thu, 08 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove incorrect prepare() usages in bp-messages-classes.php.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesclassesphp">trunk/bp-messages/bp-messages-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-classes.php (6496 => 6497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-classes.php 2012-11-08 19:25:19 UTC (rev 6496)
+++ trunk/bp-messages/bp-messages-classes.php 2012-11-08 19:37:09 UTC (rev 6497)
</span><span class="lines">@@ -144,9 +144,9 @@
</span><span class="cx"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
</span><span class="cx">
</span><span class="cx"> if ( $type == 'unread' )
</span><del>- $type_sql = $wpdb->prepare( " AND r.unread_count != 0 " );
</del><ins>+ $type_sql = " AND r.unread_count != 0 ";
</ins><span class="cx"> elseif ( $type == 'read' )
</span><del>- $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
</del><ins>+ $type_sql = " AND r.unread_count = 0 ";
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $search_terms ) ) {
</span><span class="cx"> $search_terms = like_escape( $wpdb->escape( $search_terms ) );
</span><span class="lines">@@ -199,9 +199,9 @@
</span><span class="cx"> $exclude_sender = ' AND sender_only != 1';
</span><span class="cx">
</span><span class="cx"> if ( $type == 'unread' )
</span><del>- $type_sql = $wpdb->prepare( " AND unread_count != 0 " );
</del><ins>+ $type_sql = " AND unread_count != 0 ";
</ins><span class="cx"> else if ( $type == 'read' )
</span><del>- $type_sql = $wpdb->prepare( " AND unread_count = 0 " );
</del><ins>+ $type_sql = " AND unread_count = 0 ";
</ins><span class="cx">
</span><span class="cx"> return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0$exclude_sender $type_sql", $user_id ) );
</span><span class="cx"> }
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> $bp_prefix = bp_core_get_table_prefix();
</span><span class="cx"> $errors = false;
</span><del>- $threads = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp_prefix}bp_messages_threads" ) );
</del><ins>+ $threads = $wpdb->get_results( "SELECT * FROM {$bp_prefix}bp_messages_threads" );
</ins><span class="cx">
</span><span class="cx"> // Nothing to update, just return true to remove the table
</span><span class="cx"> if ( empty( $threads ) )
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> // If we have no thread_id then this is the first message of a new thread.
</span><span class="cx"> if ( empty( $this->thread_id ) ) {
</span><del>- $this->thread_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) ) + 1;
</del><ins>+ $this->thread_id = (int) $wpdb->get_var( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) + 1;
</ins><span class="cx"> $new_thread = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> $limit_sql = $wpdb->prepare( "LIMIT %d, %d", (int) ( ( $pag_page - 1 ) * $pag_num ), (int) $pag_num );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" ) );
</del><ins>+ $notices = $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" );
</ins><span class="cx">
</span><span class="cx"> return $notices;
</span><span class="cx"> }
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> function get_total_notice_count() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices ) );
</del><ins>+ $notice_count = $wpdb->get_var( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices );
</ins><span class="cx">
</span><span class="cx"> return $notice_count;
</span><span class="cx"> }
</span><span class="lines">@@ -555,7 +555,8 @@
</span><span class="cx"> function get_active() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" ) );
</del><ins>+ $notice_id = $wpdb->get_var( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" );
+
</ins><span class="cx"> return new BP_Messages_Notice( $notice_id );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>