<!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>[38768] trunk: General: Restore usage of `$wpdb`, instead of `$this->db`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38768">38768</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38768","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-10 06:37:02 +0000 (Mon, 10 Oct 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>General: Restore usage of `$wpdb`, instead of `$this->db`.
Hiding the `$wpdb` global behind a property decreases the readability of the code, as well as causing irrelevant output when dumping an object.
Reverts <a href="https://core.trac.wordpress.org/changeset/38275">[38275]</a>, <a href="https://core.trac.wordpress.org/changeset/38278">[38278]</a>, <a href="https://core.trac.wordpress.org/changeset/38279">[38279]</a>, <a href="https://core.trac.wordpress.org/changeset/38280">[38280]</a>, <a href="https://core.trac.wordpress.org/changeset/38387">[38387]</a>.
See <a href="https://core.trac.wordpress.org/ticket/37699">#37699</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpmetaqueryphp">trunk/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnetworkqueryphp">trunk/src/wp-includes/class-wp-network-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprolesphp">trunk/src/wp-includes/class-wp-roles.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesdatephp">trunk/src/wp-includes/date.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-comment-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,13 +142,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up the comment query, based on the query vars passed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,8 +260,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->query_var_defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_email' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_url' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,9 +363,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|array List of comments or number of found comments if `$count` argument is true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_comments() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->parse_query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse meta query
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_query->parse_query_vars( $this->query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->meta_query->queries ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $this->db->comments, 'comment_ID', $this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,8 +480,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_comment_ids() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assemble clauses related to 'comment_approved'.
</span><span class="cx" style="display: block; padding: 0 10px"> $approved_clauses = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_clauses[] = $this->db->prepare( "comment_approved = %s", $status );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,11 +537,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $include_unapproved as $unapproved_identifier ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Numeric values are assumed to be user ids.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $unapproved_identifier ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $approved_clauses[] = $this->db->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise we match against email addresses.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $approved_clauses[] = $this->db->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,7 +600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no valid clauses were found, order by comment_date_gmt.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $orderby_array ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby_array[] = "{$this->db->comments}.comment_date_gmt $order";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // To ensure determinate sorting, always include a comment_ID clause.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,12 +633,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ID_order = 'DESC';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby_array[] = "{$this->db->comments}.comment_ID $comment_ID_order";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = implode( ', ', $orderby_array );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "{$this->db->comments}.comment_date_gmt $order";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "$wpdb->comments.comment_date_gmt $order";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $number = absint( $this->query_vars['number'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,22 +655,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = 'COUNT(*)';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = "{$this->db->comments}.comment_ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = "$wpdb->comments.comment_ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = absint( $this->query_vars['post_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['post_id'] = $this->db->prepare( 'comment_post_ID = %d', $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse comment IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['comment__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['comment__in'] = "{$this->db->comments}.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse comment IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['comment__not_in'] = "{$this->db->comments}.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse comment parent IDs for an IN clause.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,15 +694,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $this->query_vars['author_email'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['author_email'] = $this->db->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['author_email'] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $this->query_vars['author_url'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['author_url'] = $this->db->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['author_url'] = $wpdb->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $this->query_vars['karma'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['karma'] = $this->db->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['karma'] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -734,7 +733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_types[ $operator ][] = $this->db->prepare( '%s', $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,13 +750,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['parent'] = $this->db->prepare( 'comment_parent = %d', $parent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $parent );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['user_id'] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '' !== $this->query_vars['user_id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['user_id'] = $this->db->prepare( 'user_id = %d', $this->query_vars['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['user_id'] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Falsy search strings are ignored.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,7 +780,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_fields as $field_name => $field_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $field_value may be an array.
</span><span class="cx" style="display: block; padding: 0 10px"> $esses = array_fill( 0, count( (array) $field_value ), '%s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where'][ $field_name ] = $this->db->prepare( " {$this->db->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +801,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $join_posts_table = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $esses = array_fill( 0, count( $q_values ), '%s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where'][ $field_name ] = $this->db->prepare( " {$this->db->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $join = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $join_posts_table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= "JOIN {$this->db->posts} ON {$this->db->posts}.ID = {$this->db->comments}.comment_post_ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->meta_query_clauses ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $this->meta_query_clauses['where'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groupby = "{$this->db->comments}.comment_ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groupby = "{$wpdb->comments}.comment_ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['select'] = "SELECT $found_rows $fields";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['from'] = "FROM {$this->db->comments} $join";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['from'] = "FROM $wpdb->comments $join";
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['groupby'] = $groupby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['orderby'] = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['limits'] = $limits;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,9 +897,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $this->db->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return intval( $wpdb->get_var( $this->request ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_ids = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_ids = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_map( 'intval', $comment_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,8 +910,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function set_found_comments() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the query used to retrieve found comment count.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,7 +927,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->found_comments = (int) $this->db->get_var( $found_comments_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->found_comments = (int) $wpdb->get_var( $found_comments_query );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -940,6 +943,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function fill_descendants( $comments ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $levels = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 0 => wp_list_pluck( $comments, 'comment_ID' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,16 +1075,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $cols
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $string, $cols ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $string ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $string ) . '%';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $searches = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cols as $col ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $searches[] = $this->db->prepare( "$col LIKE %s", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return ' AND (' . implode(' OR ', $searches) . ')';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,10 +1100,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Alias for the field to order by.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Value to used in the ORDER clause. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_orderby( $orderby ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_agent',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_approved',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,19 +1139,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "{$this->db->commentmeta}.meta_value";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "$wpdb->commentmeta.meta_value";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $orderby == 'meta_value_num' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "{$this->db->commentmeta}.meta_value+0";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "$wpdb->commentmeta.meta_value+0";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $orderby == 'comment__in' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "FIELD( {$this->db->comments}.comment_ID, $comment__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, $allowed_keys ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta_query_clauses[ $orderby ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_clause = $meta_query_clauses[ $orderby ];
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "{$this->db->comments}.$orderby";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "$wpdb->comments.$orderby";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-meta-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-meta-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-meta-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,13 +106,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $has_or_relation = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,11 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $meta_query = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
- if ( ! $meta_query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !$meta_query )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relation = 'OR';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,6 +484,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $clause Query clause, passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $parent_query Parent query array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $clause_key Optional. The array key used to name the clause in the original `$meta_query`
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,6 +498,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'where' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'join' => array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'NOT EXISTS' === $meta_compare ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= " LEFT JOIN $this->meta_table";
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= $i ? " AS $alias" : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= $this->db->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // All other JOIN clauses.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'NOT EXISTS' === $meta_compare ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql_chunks['where'][] = $this->db->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,25 +601,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'IN' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'NOT IN' :
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $this->db->prepare( $meta_compare_string, $meta_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = $wpdb->prepare( $meta_compare_string, $meta_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'BETWEEN' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'NOT BETWEEN' :
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_value = array_slice( $meta_value, 0, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $this->db->prepare( '%s AND %s', $meta_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = $wpdb->prepare( '%s AND %s', $meta_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'LIKE' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'NOT LIKE' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta_value = '%' . $this->db->esc_like( $meta_value ) . '%';
- $where = $this->db->prepare( '%s', $meta_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_value = '%' . $wpdb->esc_like( $meta_value ) . '%';
+ $where = $wpdb->prepare( '%s', $meta_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // EXISTS with a value is interpreted as '='.
</span><span class="cx" style="display: block; padding: 0 10px"> case 'EXISTS' :
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_compare = '=';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $this->db->prepare( '%s', $meta_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = $wpdb->prepare( '%s', $meta_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'value' is ignored for NOT EXISTS.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $this->db->prepare( '%s', $meta_value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = $wpdb->prepare( '%s', $meta_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpnetworkqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-network-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-network-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +87,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $max_num_pages = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up the network query, based on the query vars passed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +122,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->query_var_defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'network__in' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'network__not_in' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,6 +288,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|array A single count of network IDs if a count query. An array of network IDs if a full query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_network_ids() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = $this->parse_order( $this->query_vars['order'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable ORDER BY with 'none', an empty array, or boolean false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = implode( ', ', $orderby_array );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "{$this->db->site}.id $order";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "$wpdb->site.id $order";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $number = absint( $this->query_vars['number'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,52 +347,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = 'COUNT(*)';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = "{$this->db->site}.id";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = "$wpdb->site.id";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['network__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['network__in'] = "{$this->db->site}.id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['network__in'] = "$wpdb->site.id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network IDs for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['network__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['network__not_in'] = "{$this->db->site}.id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['network__not_in'] = "$wpdb->site.id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['domain'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain'] = $this->db->prepare( "{$this->db->site}.domain = %s", $this->query_vars['domain'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain'] = $wpdb->prepare( "$wpdb->site.domain = %s", $this->query_vars['domain'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network domain for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['domain__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain__in'] = "{$this->db->site}.domain IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain__in'] = "$wpdb->site.domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network domain for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['domain__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain__not_in'] = "{$this->db->site}.domain NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain__not_in'] = "$wpdb->site.domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['path'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path'] = $this->db->prepare( "{$this->db->site}.path = %s", $this->query_vars['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path'] = $wpdb->prepare( "$wpdb->site.path = %s", $this->query_vars['path'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network path for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['path__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path__in'] = "{$this->db->site}.path IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path__in'] = "$wpdb->site.path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse network path for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['path__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path__not_in'] = "{$this->db->site}.path NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path__not_in'] = "$wpdb->site.path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Falsey search strings are ignored.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen( $this->query_vars['search'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['search'] = $this->get_search_sql(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars['search'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( "{$this->db->site}.domain", "{$this->db->site}.path" )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( "$wpdb->site.domain", "$wpdb->site.path" )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['select'] = "SELECT $found_rows $fields";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['from'] = "FROM {$this->db->site} $join";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['from'] = "FROM $wpdb->site $join";
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['groupby'] = $groupby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['orderby'] = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['limits'] = $limits;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,10 +445,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $this->db->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return intval( $wpdb->get_var( $this->request ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $network_ids = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $network_ids = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array_map( 'intval', $network_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,8 +459,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function set_found_networks() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the query used to retrieve found network count.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $found_networks_query = apply_filters( 'found_networks_query', 'SELECT FOUND_ROWS()', $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->found_networks = (int) $this->db->get_var( $found_networks_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->found_networks = (int) $wpdb->get_var( $found_networks_query );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,17 +486,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $string Search string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $columns Columns to search.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Search SQL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $string, $columns ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $string ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $string ) . '%';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $searches = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $searches[] = $this->db->prepare( "$column LIKE %s", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return '(' . implode( ' OR ', $searches ) . ')';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,10 +512,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Alias for the field to order by.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Value to used in the ORDER clause. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_orderby( $orderby ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,12 +529,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $orderby == 'network__in' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "FIELD( {$this->db->site}.id, $network__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "FIELD( {$wpdb->site}.id, $network__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $orderby == 'domain_length' || $orderby == 'path_length' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = substr( $orderby, 0, -7 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "CHAR_LENGTH({$this->db->site}.$field)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "CHAR_LENGTH($wpdb->site.$field)";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, $allowed_keys ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "{$this->db->site}.$orderby";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "$wpdb->site.$orderby";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $parsed;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,13 +487,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Resets query flags to false.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The query flags are what page info WordPress was able to figure out.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,6 +1290,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string WHERE clause.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_search( &$q ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $search = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // added slashes screw with quote grouping when done early, so done later
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1336,19 +1331,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $n && $include ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $term ) . '%';
- $q['search_orderby_title'][] = $this->db->prepare( "{$this->db->posts}.post_title LIKE %s", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $term ) . '%';
+ $q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = $n . $this->db->esc_like( $term ) . $n;
- $search .= $this->db->prepare( "{$searchand}(({$this->db->posts}.post_title $like_op %s) $andor_op ({$this->db->posts}.post_excerpt $like_op %s) $andor_op ({$this->db->posts}.post_content $like_op %s))", $like, $like, $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = $n . $wpdb->esc_like( $term ) . $n;
+ $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> $searchand = ' AND ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $search ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $search = " AND ({$search}) ";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search .= " AND ({$this->db->posts}.post_password = '') ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search .= " AND ({$wpdb->posts}.post_password = '') ";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1436,20 +1431,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string ORDER BY clause.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_search_order( &$q ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $q['search_terms_count'] > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $num_terms = count( $q['search_orderby_title'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the search terms contain negative queries, don't bother ordering by sentence matches.
</span><span class="cx" style="display: block; padding: 0 10px"> $like = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $q['s'] ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $search_orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // sentence match in 'post_title'
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $like ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_orderby .= $this->db->prepare( "WHEN {$this->db->posts}.post_title LIKE %s THEN 1 ", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // sanity limit, sort as sentence when more than 6 terms
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,8 +1461,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sentence match in 'post_content' and 'post_excerpt'.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $like ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $search_orderby .= $this->db->prepare( "WHEN {$this->db->posts}.post_excerpt LIKE %s THEN 4 ", $like );
- $search_orderby .= $this->db->prepare( "WHEN {$this->db->posts}.post_content LIKE %s THEN 5 ", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_excerpt LIKE %s THEN 4 ", $like );
+ $search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_content LIKE %s THEN 5 ", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $search_orderby ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1490,6 +1487,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_orderby( $orderby ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Used to filter values.
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name', 'post_author', 'post_date', 'post_title', 'post_modified',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1536,7 +1535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ID':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'menu_order':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'comment_count':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby_clause = "{$this->db->posts}.{$orderby}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby_clause = "{$wpdb->posts}.{$orderby}";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rand':
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_clause = 'RAND()';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1561,7 +1560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_clause = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Default: order by post field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby_clause = "{$this->db->posts}.post_" . sanitize_key( $orderby );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby_clause = "{$wpdb->posts}.post_" . sanitize_key( $orderby );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1651,6 +1650,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array List of posts.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_posts() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->parse_query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,35 +1787,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $q['fields'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ids':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = "{$this->db->posts}.ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = "{$wpdb->posts}.ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'id=>parent':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = "{$this->db->posts}.ID, {$this->db->posts}.post_parent";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = "{$wpdb->posts}.ID, {$wpdb->posts}.post_parent";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = "{$this->db->posts}.*";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = "{$wpdb->posts}.*";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $q['menu_order'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.menu_order = " . $q['menu_order'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.menu_order = " . $q['menu_order'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // The "m" parameter is meant for months but accepts datetimes of varying specificity
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['m'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND YEAR({$this->db->posts}.post_date)=" . substr($q['m'], 0, 4);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr($q['m'], 0, 4);
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($q['m']) > 5 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND MONTH({$this->db->posts}.post_date)=" . substr($q['m'], 4, 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND MONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 4, 2);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($q['m']) > 7 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND DAYOFMONTH({$this->db->posts}.post_date)=" . substr($q['m'], 6, 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 6, 2);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($q['m']) > 9 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND HOUR({$this->db->posts}.post_date)=" . substr($q['m'], 8, 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND HOUR({$wpdb->posts}.post_date)=" . substr($q['m'], 8, 2);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($q['m']) > 11 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND MINUTE({$this->db->posts}.post_date)=" . substr($q['m'], 10, 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND MINUTE({$wpdb->posts}.post_date)=" . substr($q['m'], 10, 2);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($q['m']) > 13 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND SECOND({$this->db->posts}.post_date)=" . substr($q['m'], 12, 2);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND SECOND({$wpdb->posts}.post_date)=" . substr($q['m'], 12, 2);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1878,13 +1879,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $q['title'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->db->prepare( " AND {$this->db->posts}.post_title = %s", stripslashes( $q['title'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_title = %s", stripslashes( $q['title'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parameters related to 'post_name'.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $q['name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = sanitize_title_for_query( $q['name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_name = '" . $q['name'] . "'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '' != $q['pagename'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($this->queried_object_id) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $reqpage = $this->queried_object_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1913,7 +1914,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = $q['pagename'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND ({$this->db->posts}.ID = '$reqpage')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND ({$wpdb->posts}.ID = '$reqpage')";
</ins><span class="cx" style="display: block; padding: 0 10px"> $reqpage_obj = get_post( $reqpage );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_attachment = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1925,11 +1926,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '' != $q['attachment'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = $q['attachment'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_name = '" . $q['attachment'] . "'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_name IN ($post_name__in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If an attachment is requested by number, let it supersede any post number.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1938,29 +1939,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a post number is specified, load that post
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['p'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.ID = " . $q['p'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.ID = " . $q['p'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post__in'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post__in = implode(',', array_map( 'absint', $q['post__in'] ));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.ID IN ($post__in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.ID IN ($post__in)";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post__not_in'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post__not_in = implode(',', array_map( 'absint', $q['post__not_in'] ));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.ID NOT IN ($post__not_in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $q['post_parent'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->db->prepare( " AND {$this->db->posts}.post_parent = %d ", $q['post_parent'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_parent = %d ", $q['post_parent'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post_parent__in'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_parent IN ($post_parent__in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['post_parent__not_in'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_parent NOT IN ($post_parent__not_in)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['page_id'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['p'] = $q['page_id'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = " AND {$this->db->posts}.ID = " . $q['page_id'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,7 +1986,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$this->is_singular ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->parse_tax_query( $q );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clauses = $this->tax_query->get_sql( $this->db->posts, 'ID' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= $clauses['join'];
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $clauses['where'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2069,7 +2070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groupby = "{$this->db->posts}.ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groupby = "{$wpdb->posts}.ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Author/user stuff
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2086,10 +2087,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['author__not_in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_author NOT IN ($author__not_in) ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $q['author__in'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_author IN ($author__in) ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Author stuff for nice URLs
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2107,18 +2108,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['author'] = get_user_by('slug', $q['author_name']);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['author'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $q['author'] = $q['author']->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whichauthor .= " AND ({$this->db->posts}.post_author = " . absint($q['author']) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // MIME-Type stuff for attachment browsing
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $this->db->posts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $search . $whichauthor . $whichmimetype;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->meta_query->queries ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clauses = $this->meta_query->get_sql( 'post', $this->db->posts, 'ID', $this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
</ins><span class="cx" style="display: block; padding: 0 10px"> $join .= $clauses['join'];
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $clauses['where'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2139,16 +2140,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['orderby'] ) && ( is_array( $q['orderby'] ) || false === $q['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "{$this->db->posts}.post_date " . $q['order'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "{$wpdb->posts}.post_date " . $q['order'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'none' == $q['orderby'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "FIELD( {$this->db->posts}.ID, $post__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "FIELD( {$this->db->posts}.post_parent, $post_parent__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $q['orderby'] == 'post_name__in' && ! empty( $post_name__in ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "FIELD( {$this->db->posts}.post_name, $post_name__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "FIELD( {$wpdb->posts}.post_name, $post_name__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $q['orderby'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2180,7 +2181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $orderby ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = "{$this->db->posts}.post_date " . $q['order'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = "{$wpdb->posts}.post_date " . $q['order'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $q['order'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby .= " {$q['order']}";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2220,20 +2221,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['post_password'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->db->prepare( " AND {$this->db->posts}.post_password = %s", $q['post_password'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_password = %s", $q['post_password'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $q['perm'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['perm'] = 'readable';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $q['has_password'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= sprintf( " AND {$this->db->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= sprintf( " AND {$wpdb->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['comment_status'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->db->prepare( " AND {$this->db->posts}.comment_status = %s ", $q['comment_status'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND {$wpdb->posts}.comment_status = %s ", $q['comment_status'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['ping_status'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $this->db->prepare( " AND {$this->db->posts}.ping_status = %s ", $q['ping_status'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND {$wpdb->posts}.ping_status = %s ", $q['ping_status'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'any' == $post_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2241,21 +2242,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $in_search_post_types ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= ' AND 1=0 ';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type IN ('" . join("', '", $post_type) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", $post_type) . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type = '$post_type'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type = '$post_type'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object ( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $this->is_attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type = 'attachment'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type = 'attachment'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object ( 'attachment' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $this->is_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type = 'page'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type = 'page'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object ( 'page' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$this->db->posts}.post_type = 'post'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type = 'post'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object ( 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2284,16 +2285,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'any', $q_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $status, $q_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $e_status[] = "{$this->db->posts}.post_status <> '$status'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $e_status[] = "{$wpdb->posts}.post_status <> '$status'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati() as $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $status, $q_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'private' == $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $p_status[] = "{$this->db->posts}.post_status = '$status'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $p_status[] = "{$wpdb->posts}.post_status = '$status'";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r_status[] = "{$this->db->posts}.post_status = '$status'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r_status[] = "{$wpdb->posts}.post_status = '$status'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2309,22 +2310,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($r_status) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = "({$this->db->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($p_status) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = "({$this->db->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_status_join ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= " LEFT JOIN {$this->db->posts} AS p2 ON ({$this->db->posts}.post_parent = p2.ID) ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= " LEFT JOIN {$wpdb->posts} AS p2 ON ({$wpdb->posts}.post_parent = p2.ID) ";
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $statuswheres as $index => $statuswhere ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[$index] = "($statuswhere OR ({$this->db->posts}.post_status = 'inherit' AND " . str_replace( $this->db->posts, 'p2', $statuswhere ) . "))";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND " . str_replace( $wpdb->posts, 'p2', $statuswhere ) . "))";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $where_status = implode( ' OR ', $statuswheres );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2332,21 +2333,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND ($where_status)";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( !$this->is_singular ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND ({$this->db->posts}.post_status = 'publish'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND ({$wpdb->posts}.post_status = 'publish'";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add public states.
</span><span class="cx" style="display: block; padding: 0 10px"> $public_states = get_post_stati( array('public' => true) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $public_states as $state ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $state ) // Publish is hard-coded above.
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " OR {$this->db->posts}.post_status = '$state'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " OR {$wpdb->posts}.post_status = '$state'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_admin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add protected states that should show in the admin all list.
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $admin_all_states as $state ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " OR {$this->db->posts}.post_status = '$state'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " OR {$wpdb->posts}.post_status = '$state'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,7 +2355,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
</span><span class="cx" style="display: block; padding: 0 10px"> $private_states = get_post_stati( array('private' => true) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $private_states as $state ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= current_user_can( $read_private_cap ) ? " OR {$this->db->posts}.post_status = '$state'" : " OR {$this->db->posts}.post_author = $user_id AND {$this->db->posts}.post_status = '$state'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= current_user_can( $read_private_cap ) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2406,11 +2407,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Comments feeds
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_comment_feed && ! $this->is_singular ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_archive || $this->is_search ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cjoin = "JOIN {$this->db->posts} ON ({$this->db->comments}.comment_post_ID = {$this->db->posts}.ID) $join ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cjoin = "JOIN {$wpdb->posts} ON ({$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID) $join ";
</ins><span class="cx" style="display: block; padding: 0 10px"> $cwhere = "WHERE comment_approved = '1' $where";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cgroupby = "{$this->db->comments}.comment_id";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cgroupby = "{$wpdb->comments}.comment_id";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else { // Other non singular e.g. front
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cjoin = "JOIN {$this->db->posts} ON ( {$this->db->comments}.comment_post_ID = {$this->db->posts}.ID )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cjoin = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
</ins><span class="cx" style="display: block; padding: 0 10px"> $cwhere = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";
</span><span class="cx" style="display: block; padding: 0 10px"> $cgroupby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2469,7 +2470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = (array) $this->db->get_results("SELECT $distinct {$this->db->comments}.* FROM {$this->db->comments} $cjoin $cwhere $cgroupby $corderby $climits");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = (array) $wpdb->get_results("SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits");
</ins><span class="cx" style="display: block; padding: 0 10px"> // Convert to WP_Comment
</span><span class="cx" style="display: block; padding: 0 10px"> $this->comments = array_map( 'get_comment', $comments );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->comment_count = count($this->comments);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2482,7 +2483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids = join(',', $post_ids);
</span><span class="cx" style="display: block; padding: 0 10px"> $join = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_ids ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = "AND {$this->db->posts}.ID IN ($post_ids) ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = "AND {$wpdb->posts}.ID IN ($post_ids) ";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $where = "AND 0";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2724,7 +2725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$q['no_found_rows'] && !empty($limits) )
</span><span class="cx" style="display: block; padding: 0 10px"> $found_rows = 'SQL_CALC_FOUND_ROWS';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$this->db->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$q['suppress_filters'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2758,7 +2759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'ids' == $q['fields'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $this->posts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->posts = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->posts = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = array_map( 'intval', $this->posts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2770,7 +2771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id=>parent' == $q['fields'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $this->posts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->posts = $this->db->get_results( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->posts = $wpdb->get_results( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_count = count( $this->posts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2788,7 +2789,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $this->posts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $split_the_query = ( $old_request == $this->request && "{$this->db->posts}.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to split the query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2807,7 +2808,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $split_the_query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // First get the IDs and then fill in the objects
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->request = "SELECT $found_rows $distinct {$this->db->posts}.ID FROM {$this->db->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->request = "SELECT $found_rows $distinct {$wpdb->posts}.ID FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the Post IDs SQL request before sending.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2819,7 +2820,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = apply_filters( 'posts_request_ids', $this->request, $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ids = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = $ids;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2829,7 +2830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->posts = $this->db->get_results( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->posts = $wpdb->get_results( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_found_posts( $q, $limits );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2869,8 +2870,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/query.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments_request = "SELECT {$this->db->comments}.* FROM {$this->db->comments} $cjoin $cwhere $cgroupby $corderby $climits";
- $comments = $this->db->get_results($comments_request);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments_request = "SELECT {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";
+ $comments = $wpdb->get_results($comments_request);
</ins><span class="cx" style="display: block; padding: 0 10px"> // Convert to WP_Comment
</span><span class="cx" style="display: block; padding: 0 10px"> $this->comments = array_map( 'get_comment', $comments );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->comment_count = count($this->comments);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3017,6 +3018,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $limits LIMIT clauses of the query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function set_found_posts( $q, $limits ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if posts is an empty array. Continue if posts is an empty string,
</span><span class="cx" style="display: block; padding: 0 10px"> // null, or false to accommodate caching plugins that fill posts later.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3031,7 +3033,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $found_posts The query to run to find the found posts.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query &$this The WP_Query instance (passed by reference).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->found_posts = $this->db->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->found_posts = count( $this->posts );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3328,8 +3330,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query URL query string or array of vars.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprolesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-roles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-roles.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-roles.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,20 +70,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $use_db = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->_init();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,8 +108,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_user_roles Used to set the 'roles' property value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _init() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_user_roles;
- $this->role_key = $this->db->get_blog_prefix() . 'user_roles';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_user_roles, $wpdb;
+
+ $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $wp_user_roles ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->roles = $wp_user_roles;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->use_db = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,13 +139,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function reinit() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // There is no need to reinit if using the wp_user_roles global.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->use_db ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Duplicated from _init() to avoid an extra function call.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->role_key = $this->db->get_blog_prefix() . 'user_roles';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->roles = get_option( $this->role_key );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->roles ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsitequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-site-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-site-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,13 +96,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $max_num_pages = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Sets up the site query, based on the query vars passed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,8 +145,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->query_var_defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,9 +323,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|array A single count of site IDs if a count query. An array of site IDs if a full query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_site_ids() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = $this->parse_order( $this->query_vars['order'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable ORDER BY with 'none', an empty array, or boolean false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +393,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site IDs for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = absint( $this->query_vars['ID'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $site_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['ID'] = $this->db->prepare( 'blog_id = %d', $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['ID'] = $wpdb->prepare( 'blog_id = %d', $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site IDs for an IN clause.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = absint( $this->query_vars['network_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $network_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['network_id'] = $this->db->prepare( 'site_id = %d', $network_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['network_id'] = $wpdb->prepare( 'site_id = %d', $network_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site network IDs for an IN clause.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,56 +423,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['domain'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain'] = $this->db->prepare( 'domain = %s', $this->query_vars['domain'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain'] = $wpdb->prepare( 'domain = %s', $this->query_vars['domain'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site domain for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['domain__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain__in'] = "domain IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain__in'] = "domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site domain for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['domain__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['domain__not_in'] = "domain NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['domain__not_in'] = "domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['path'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path'] = $this->db->prepare( 'path = %s', $this->query_vars['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path'] = $wpdb->prepare( 'path = %s', $this->query_vars['path'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site path for an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['path__in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path__in'] = "path IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path__in'] = "path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse site path for a NOT IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $this->query_vars['path__not_in'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['path__not_in'] = "path NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['path__not_in'] = "path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $this->query_vars['archived'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $archived = absint( $this->query_vars['archived'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['archived'] = $this->db->prepare( "archived = %d ", $archived );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['archived'] = $wpdb->prepare( "archived = %d ", $archived );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $this->query_vars['mature'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mature = absint( $this->query_vars['mature'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['mature'] = $this->db->prepare( "mature = %d ", $mature );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['mature'] = $wpdb->prepare( "mature = %d ", $mature );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $this->query_vars['spam'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $spam = absint( $this->query_vars['spam'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['spam'] = $this->db->prepare( "spam = %d ", $spam );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['spam'] = $wpdb->prepare( "spam = %d ", $spam );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $this->query_vars['deleted'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = absint( $this->query_vars['deleted'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['deleted'] = $this->db->prepare( "deleted = %d ", $deleted );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['deleted'] = $wpdb->prepare( "deleted = %d ", $deleted );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $this->query_vars['public'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $public = absint( $this->query_vars['public'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['public'] = $this->db->prepare( "public = %d ", $public );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['public'] = $wpdb->prepare( "public = %d ", $public );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Falsey search strings are ignored.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['select'] = "SELECT $found_rows $fields";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['from'] = "FROM {$this->db->blogs} $join";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['from'] = "FROM $wpdb->blogs $join";
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['groupby'] = $groupby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['orderby'] = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['limits'] = $limits;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,10 +558,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $this->db->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return intval( $wpdb->get_var( $this->request ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_ids = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_ids = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array_map( 'intval', $site_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,8 +572,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function set_found_sites() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the query used to retrieve found site count.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $found_sites_query = apply_filters( 'found_sites_query', 'SELECT FOUND_ROWS()', $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->found_sites = (int) $this->db->get_var( $found_sites_query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->found_sites = (int) $wpdb->get_var( $found_sites_query );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,20 +599,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $string Search string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $columns Columns to search.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Search SQL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $string, $columns ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $string, '*' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . implode( '%', array_map( array( $this->db, 'esc_like' ), explode( '*', $string ) ) ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) ) . '%';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $string ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $string ) . '%';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $searches = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $searches[] = $this->db->prepare( "$column LIKE %s", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return '(' . implode( ' OR ', $searches ) . ')';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,20 +628,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Alias for the field to order by.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Value to used in the ORDER clause. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_orderby( $orderby ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'site__in':
</span><span class="cx" style="display: block; padding: 0 10px"> $site__in = implode( ',', array_map( 'absint', $this->query_vars['site__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "FIELD( {$this->db->blogs}.blog_id, $site__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "FIELD( {$wpdb->blogs}.blog_id, $site__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'network__in':
</span><span class="cx" style="display: block; padding: 0 10px"> $network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = "FIELD( {$this->db->blogs}.site_id, $network__in )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = "FIELD( {$wpdb->blogs}.site_id, $network__in )";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'domain':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'last_updated':
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptaxqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-tax-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-tax-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-tax-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,13 +92,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $primary_id_column;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,8 +119,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $tax_query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $tax_query['relation'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relation = $this->sanitize_relation( $tax_query['relation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,6 +387,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb The WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $clause Query clause, passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $parent_query Parent query array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,6 +399,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_sql_for_clause( &$clause, $parent_query ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'where' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'join' => array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,7 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $alias = $this->find_compatible_table_alias( $clause, $parent_query );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $alias ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $i = count( $this->table_aliases );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alias = $i ? 'tt' . $i : $this->db->term_relationships;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Store the alias as part of a flat array to build future iterators.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->table_aliases[] = $alias;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Store the alias with this clause, so later siblings can use it.
</span><span class="cx" style="display: block; padding: 0 10px"> $clause['alias'] = $alias;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= " LEFT JOIN {$this->db->term_relationships}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= " LEFT JOIN $wpdb->term_relationships";
</ins><span class="cx" style="display: block; padding: 0 10px"> $join .= $i ? " AS $alias" : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +458,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = "$this->primary_table.$this->primary_id_column NOT IN (
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT object_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->term_relationships}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->term_relationships
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx" style="display: block; padding: 0 10px"> )";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,20 +474,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = "(
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT COUNT(1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->term_relationships}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->term_relationships
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx" style="display: block; padding: 0 10px"> AND object_id = $this->primary_table.$this->primary_id_column
</span><span class="cx" style="display: block; padding: 0 10px"> ) = $num_terms";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = $this->db->prepare( "$operator (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = $wpdb->prepare( "$operator (
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT 1
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->term_relationships}
- INNER JOIN {$this->db->term_taxonomy}
- ON {$this->db->term_taxonomy}.term_taxonomy_id = {$this->db->term_relationships}.term_taxonomy_id
- WHERE {$this->db->term_taxonomy}.taxonomy = %s
- AND {$this->db->term_relationships}.object_id = $this->primary_table.$this->primary_id_column
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->term_relationships
+ INNER JOIN $wpdb->term_taxonomy
+ ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
+ WHERE $wpdb->term_taxonomy.taxonomy = %s
+ AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
</ins><span class="cx" style="display: block; padding: 0 10px"> )", $clause['taxonomy'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,11 +597,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb The WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $query The single query. Passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
</span><span class="cx" style="display: block; padding: 0 10px"> * or 'term_id'. Default 'term_id'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function transform_query( &$query, $resulting_field ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $query['terms'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,27 +628,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = implode( ",", $query['terms'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->db->get_col( "
- SELECT {$this->db->term_taxonomy}.$resulting_field
- FROM {$this->db->term_taxonomy}
- INNER JOIN {$this->db->terms} USING (term_id)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = $wpdb->get_col( "
+ SELECT $wpdb->term_taxonomy.$resulting_field
+ FROM $wpdb->term_taxonomy
+ INNER JOIN $wpdb->terms USING (term_id)
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE taxonomy = '{$query['taxonomy']}'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND {$this->db->terms}.{$query['field']} IN ($terms)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND $wpdb->terms.{$query['field']} IN ($terms)
</ins><span class="cx" style="display: block; padding: 0 10px"> " );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'term_taxonomy_id':
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->db->get_col( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = $wpdb->get_col( "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT $resulting_field
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->term_taxonomy}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->term_taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE term_taxonomy_id IN ($terms)
</span><span class="cx" style="display: block; padding: 0 10px"> " );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->db->get_col( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = $wpdb->get_col( "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT $resulting_field
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->term_taxonomy}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->term_taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE taxonomy = '{$query['taxonomy']}'
</span><span class="cx" style="display: block; padding: 0 10px"> AND term_id IN ($terms)
</span><span class="cx" style="display: block; padding: 0 10px"> " );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-term-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,13 +87,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $terms;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up the term query, based on the query vars passed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,8 +179,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->query_var_defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_ids' => null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,9 +305,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_terms() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->parse_query( $this->query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = $this->query_vars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,16 +504,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = implode( ',', array_map( 'intval', $args['term_taxonomy_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['term_taxonomy_id'] = "tt.term_taxonomy_id IN ({$tt_ids})";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['term_taxonomy_id'] = $this->db->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['name__like'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['name__like'] = $this->db->prepare( "t.name LIKE %s", '%' . $this->db->esc_like( $args['name__like'] ) . '%' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['name__like'] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['description__like'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['description__like'] = $this->db->prepare( "tt.description LIKE %s", '%' . $this->db->esc_like( $args['description__like'] ) . '%' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['description__like'] = $wpdb->prepare( "tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['object_ids'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,10 +633,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = implode( ', ', apply_filters( 'get_terms_fields', $selects, $args, $taxonomies ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= " INNER JOIN {$this->db->term_taxonomy} AS tt ON t.term_id = tt.term_id";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['object_ids'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join .= " INNER JOIN {$this->db->term_relationships} AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= " INNER JOIN {$wpdb->term_relationships} AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = implode( ' AND ', $this->sql_clauses['where'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,7 +665,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['select'] = "SELECT $distinct $fields";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['from'] = "FROM {$this->db->terms} AS t $join";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['from'] = "FROM $wpdb->terms AS t $join";
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['limits'] = $limits;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,10 +690,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'count' == $_fields ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->db->get_var( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $wpdb->get_var( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = $this->db->get_results( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = $wpdb->get_results( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'all' == $_fields || 'all_with_object_id' === $_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_term_cache( $terms );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,6 +825,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby_raw Alias for the field to order by.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Value to used in the ORDER clause. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,12 +963,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $string
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $string ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = '%' . $this->db->esc_like( $string ) . '%';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->db->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = '%' . $wpdb->esc_like( $string ) . '%';
+
+ return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-user-query.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,13 +71,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $query_limit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * PHP5 constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,8 +78,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param null|string|array $query Optional. The query variables.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $query = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->prepare_query( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,6 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global int $blog_id
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,6 +216,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_query( $query = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->query_vars ) || ! empty( $query ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_limit = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars = $this->fill_query_vars( $query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,19 +246,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $qv['fields'] as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = 'ID' === $field ? 'ID' : sanitize_key( $field );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_fields[] = "{$this->db->users}.$field";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_fields[] = "$wpdb->users.$field";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = implode( ',', $this->query_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'all' == $qv['fields'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_fields = "{$this->db->users}.*";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_fields = "$wpdb->users.*";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_fields = "{$this->db->users}.ID";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_fields = "$wpdb->users.ID";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $qv['count_total'] ) && $qv['count_total'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_from = "FROM {$this->db->users}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_from = "FROM $wpdb->users";
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_where = "WHERE 1=1";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,16 +281,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_types as &$post_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type = $this->db->prepare( '%s', $post_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = $wpdb->prepare( '%s', $post_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_table = $this->db->get_blog_prefix( $blog_id ) . 'posts';
- $this->query_where .= " AND {$this->db->users}.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
+ $this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // nicename
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $qv['nicename']) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_where .= $this->db->prepare( ' AND user_nicename = %s', $qv['nicename'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_where .= $wpdb->prepare( ' AND user_nicename = %s', $qv['nicename'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $qv['nicename__in'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // login
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $qv['login']) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_where .= $this->db->prepare( ' AND user_login = %s', $qv['login'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_where .= $wpdb->prepare( ' AND user_login = %s', $qv['login'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $qv['login__in'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $who_query = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => $this->db->get_blog_prefix( $blog_id ) . 'user_level',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => '!=',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $roles ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $roles as $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $roles_clauses[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => '"' . $role . '"',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'LIKE',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $role__in ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $role__in as $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $role__in_clauses[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => '"' . $role . '"',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'LIKE',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $role__not_in ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $role__not_in as $role ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $role__not_in_clauses[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'value' => '"' . $role . '"',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'NOT LIKE',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If there are no specific roles named, make sure the user is a member of the site.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $role_queries ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $role_queries[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'key' => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'compare' => 'EXISTS',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,7 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->meta_query->queries ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clauses = $this->meta_query->get_sql( 'user', $this->db->users, 'ID', $this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_from .= $clauses['join'];
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_where .= $clauses['where'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,9 +497,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // limit
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $qv['offset'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_limit = $this->db->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_limit = $this->db->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,10 +555,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $include ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitized earlier.
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = implode( ',', $include );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_where .= " AND {$this->db->users}.ID IN ($ids)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $qv['exclude'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_where .= " AND {$this->db->users}.ID NOT IN ($ids)";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Date queries are allowed for the user_registered field.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,16 +586,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Execute the query, with the current variables.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function query() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $qv =& $this->query_vars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->results = $this->db->get_results( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->results = $wpdb->get_results( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->results = $this->db->get_col( $this->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->results = $wpdb->get_col( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,15 +607,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
- $this->total_users = $this->db->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $qv['count_total'] ) && $qv['count_total'] )
+ $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $this->results ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !$this->results )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'all_with_meta' == $qv['fields'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> cache_users( $this->results );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,6 +667,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $cols
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for single site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,16 +676,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $string, $cols, $wild = false ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $searches = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $like = $leading_wild . $this->db->esc_like( $string ) . $trailing_wild;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cols as $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'ID' == $col ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $searches[] = $this->db->prepare( "$col = %s", $string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searches[] = $wpdb->prepare( "$col = %s", $string );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $searches[] = $this->db->prepare( "$col LIKE %s", $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,10 +724,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Alias for the field to order by.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Value to used in the ORDER clause, if `$orderby` is valid.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function parse_orderby( $orderby ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_query_clauses = $this->meta_query->get_clauses();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,22 +746,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where = get_posts_by_author_sql( 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_from .= " LEFT OUTER JOIN (
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT post_author, COUNT(*) as post_count
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->posts}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM $wpdb->posts
</ins><span class="cx" style="display: block; padding: 0 10px"> $where
</span><span class="cx" style="display: block; padding: 0 10px"> GROUP BY post_author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) p ON ({$this->db->users}.ID = p.post_author)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) p ON ({$wpdb->users}.ID = p.post_author)
</ins><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'post_count';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'ID' == $orderby || 'id' == $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'ID';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_orderby = "{$this->db->usermeta}.meta_value";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_orderby = "$wpdb->usermeta.meta_value";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'meta_value_num' == $orderby ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_orderby = "{$this->db->usermeta}.meta_value+0";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_orderby = "$wpdb->usermeta.meta_value+0";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $include = wp_parse_id_list( $this->query_vars['include'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $include_sql = implode( ',', $include );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_orderby = "FIELD( {$this->db->users}.ID, $include_sql )";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'nicename__in' === $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sanitized_nicename__in = array_map( 'esc_sql', $this->query_vars['nicename__in'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $nicename__in = implode( "','", $sanitized_nicename__in );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-user.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,13 +104,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static $back_compat_keys;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the userdata and passes it to WP_User::init().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,15 +111,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Optional. User's username
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id Optional Site ID, defaults to current site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $id = 0, $name = '', $blog_id = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( self::$back_compat_keys ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prefix = $this->db->prefix;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prefix = $GLOBALS['wpdb']->prefix;
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$back_compat_keys = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_firstname' => 'first_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_lastname' => 'last_name',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,10 +234,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$user = $wpdb->get_row( $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT * FROM {$wpdb->users} WHERE $db_field = %s", $value
- ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
+ ) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_user_caches( $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $user;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,14 +444,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $cap_key Optional capability key
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _init_caps( $cap_key = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $cap_key ) ) {
- $this->cap_key = $this->db->get_blog_prefix() . 'capabilities';
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
+ if ( empty($cap_key) )
+ $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+ else
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->cap_key = $cap_key;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->caps = get_user_meta( $this->ID, $this->cap_key, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $this->caps ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,10 +633,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function update_user_level_from_caps() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $this->ID, $this->db->get_blog_prefix() . 'user_level', $this->user_level );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,11 +681,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_all_caps() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->caps = array();
</span><span class="cx" style="display: block; padding: 0 10px"> delete_user_meta( $this->ID, $this->cap_key );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_user_meta( $this->ID, $this->db->get_blog_prefix() . 'user_level' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->get_role_caps();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,14 +774,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id Optional. Site ID, defaults to current site.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function for_blog( $blog_id = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $blog_id ) ) {
- $cap_key = $this->db->get_blog_prefix( $blog_id ) . 'capabilities';
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+ if ( ! empty( $blog_id ) )
+ $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+ else
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap_key = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px"> $this->_init_caps( $cap_key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,13 +54,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $auth_failed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Registers all of the XMLRPC methods that XMLRPC server understands.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Sets up server and method property. Passes XMLRPC
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +63,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->methods = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // WordPress API
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2894,6 +2885,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Method arguments. Note: arguments must be ordered as documented.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2904,6 +2897,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function wp_getPageList( $args ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->escape( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $username = $args[1];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2919,14 +2914,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPageList' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get list of pages ids and titles
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_list = $this->db->get_results("
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_list = $wpdb->get_results("
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT ID page_id,
</span><span class="cx" style="display: block; padding: 0 10px"> post_title page_title,
</span><span class="cx" style="display: block; padding: 0 10px"> post_parent page_parent_id,
</span><span class="cx" style="display: block; padding: 0 10px"> post_date_gmt,
</span><span class="cx" style="display: block; padding: 0 10px"> post_date,
</span><span class="cx" style="display: block; padding: 0 10px"> post_status
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FROM {$this->db->posts}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FROM {$wpdb->posts}
</ins><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = 'page'
</span><span class="cx" style="display: block; padding: 0 10px"> ORDER BY ID
</span><span class="cx" style="display: block; padding: 0 10px"> ");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5143,17 +5138,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_ID Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_content Post Content for attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function attach_uploads( $post_ID, $post_content ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // find any unattached files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachments = $this->db->get_results( "SELECT ID, guid FROM {$this->db->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $attachments ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attachments as $file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
- $this->db->update( $this->db->posts, array( 'post_parent' => $post_ID ), array( 'ID' => $file->ID ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
+ $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5773,6 +5771,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Method arguments. Note: arguments must be ordered as documented.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5784,6 +5784,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function mw_newMediaObject( $args ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $username = $this->escape( $args[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $password = $this->escape( $args[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $args[3];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6109,10 +6111,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_ID
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function mt_getTrackbackPings( $post_ID ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6121,7 +6127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$actual_post )
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error(404, __('Sorry, no such post.'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->db->get_results( $this->db->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->db->comments} WHERE comment_post_ID = %d", $post_ID) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$comments )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6256,8 +6262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_string($urltest['fragment']) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // ...or a string #title, a little more complicated
</span><span class="cx" style="display: block; padding: 0 10px"> $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = $this->db->prepare("SELECT ID FROM {$this->db->posts} WHERE post_title RLIKE %s", $title );
- if (! ($post_ID = $this->db->get_var($sql)) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
+ if (! ($post_ID = $wpdb->get_var($sql)) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // returning unknown error '0' is better than die()ing
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 0, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6281,7 +6287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's check that the remote site didn't already pingback this entry
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->db->get_results( $this->db->prepare("SELECT * FROM {$this->db->comments} WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // very stupid, but gives time to the 'from' server to publish !
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6408,10 +6414,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $url
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function pingback_extensions_getPingbacks( $url ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6430,7 +6440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 32, __('The specified target URL does not exist.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comments = $this->db->get_results( $this->db->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->db->comments} WHERE comment_post_ID = %d", $post_ID) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$comments )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span></span></pre></div>
<a id="trunksrcwpincludesdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/date.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/src/wp-includes/date.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,13 +63,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.7.0
- * @access protected
- * @var wpdb
- */
- protected $db;
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Time-related parameters that normally require integer values ('year', 'month', 'week', 'dayofyear', 'day',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,8 +151,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'comment_date', 'comment_date_gmt'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $date_query, $default_column = 'post_date' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db = $GLOBALS['wpdb'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relation = 'OR';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,6 +485,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string A validated column name value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function validate_column( $column ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $valid_columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date', 'post_date_gmt', 'post_modified',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_modified_gmt', 'comment_date', 'comment_date_gmt',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,20 +511,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $known_columns = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db->posts => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->posts => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date_gmt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_modified',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_modified_gmt',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db->comments => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->comments => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db->users => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->db->blogs => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->blogs => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'registered',
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_updated',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,6 +716,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_sql_for_clause( $query, $parent_query ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // The sub-parts of a $where part.
</span><span class="cx" style="display: block; padding: 0 10px"> $where_parts = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,10 +740,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Range queries.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $query['after'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where_parts[] = $this->db->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $query['before'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where_parts[] = $this->db->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Specific value queries.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -962,6 +957,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false A query part or false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Have to have at least one
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,6 +1012,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time .= sprintf( '%02d', $second );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->db->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2016-10-09 23:40:53 UTC (rev 38767)
+++ trunk/tests/phpunit/tests/user.php 2016-10-10 06:37:02 UTC (rev 38768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,9 +181,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'foo', $user->data->$key ); // This will fail with WP < 3.3
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $user as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $value instanceof wpdb ) {
- continue;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $value, $user->$key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>