<!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>[13353] trunk: Don't use private wpdb vars.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13353">13353</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-24 00:18:18 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use private wpdb vars. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (13352 => 13353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-02-23 23:53:08 UTC (rev 13352)
+++ trunk/wp-includes/comment.php 2010-02-24 00:18:18 UTC (rev 13353)
</span><span class="lines">@@ -1382,10 +1382,8 @@
</span><span class="cx"> $comment_approved = 1;
</span><span class="cx">
</span><span class="cx"> $data = compact('comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt');
</span><del>- $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
</del><ins>+ $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
</ins><span class="cx">
</span><del>- $rval = $wpdb->rows_affected;
-
</del><span class="cx"> clean_comment_cache($comment_ID);
</span><span class="cx"> wp_update_comment_count($comment_post_ID);
</span><span class="cx"> do_action('edit_comment', $comment_ID);
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (13352 => 13353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-02-23 23:53:08 UTC (rev 13352)
+++ trunk/xmlrpc.php 2010-02-24 00:18:18 UTC (rev 13353)
</span><span class="lines">@@ -3203,11 +3203,9 @@
</span><span class="cx"> return new IXR_Error(33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.'));
</span><span class="cx">
</span><span class="cx"> // Let's check that the remote site didn't already pingback this entry
</span><del>- $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) );
</del><ins>+ if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
+ return new IXR_Error( 48, __( 'The pingback has already been registered.' ) );
</ins><span class="cx">
</span><del>- if ( $wpdb->num_rows ) // We already have a Pingback from this URL
- return new IXR_Error(48, __('The pingback has already been registered.'));
-
</del><span class="cx"> // very stupid, but gives time to the 'from' server to publish !
</span><span class="cx"> sleep(1);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>