Changeset 38768 for trunk/src/wp-includes/class-wp-xmlrpc-server.php

Timestamp:

10/10/2016 06:37:02 AM (8 years ago)

Author:

pento

Message:

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 [38275], [38278], [38279], [38280], [38387].
See #37699.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (15 diffs)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -55 +55 @@
 
     /**
-     * @since 4.7.0
-     * @access protected
-     * @var wpdb
-     */
-    protected $db;
-
-    /**
      * Registers all of the XMLRPC methods that XMLRPC server understands.
      *
@@ -71 +64 @@
      */
     public function __construct() {
-        $this->db = $GLOBALS['wpdb'];
-
         $this->methods = array(
             // WordPress API
@@ -2895 +2886 @@
      * @since 2.2.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param array  $args {
      *     Method arguments. Note: arguments must be ordered as documented.
@@ -2905 +2898 @@
      */
     public function wp_getPageList( $args ) {
+        global $wpdb;
+
         $this->escape( $args );
 
@@ -2920 +2915 @@
 
         // Get list of pages ids and titles
-        $page_list = $this->db->get_results("
+        $page_list = $wpdb->get_results("
             SELECT ID page_id,
                 post_title page_title,
@@ -2927 +2922 @@
                 post_date,
                 post_status
-            FROM {$this->db->posts}
+            FROM {$wpdb->posts}
             WHERE post_type = 'page'
             ORDER BY ID
@@ -5144 +5139 @@
      * @since 2.1.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param int $post_ID Post ID.
      * @param string $post_content Post Content for attachment.
      */
     public function attach_uploads( $post_ID, $post_content ) {
+        global $wpdb;
+
         // find any unattached files
-        $attachments = $this->db->get_results( "SELECT ID, guid FROM {$this->db->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
+        $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
         if ( is_array( $attachments ) ) {
             foreach ( $attachments as $file ) {
-                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 ) );
-                }
+                if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
+                    $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
             }
         }
@@ -5774 +5772 @@
      * @since 1.5.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param array  $args {
      *     Method arguments. Note: arguments must be ordered as documented.
@@ -5785 +5785 @@
      */
     public function mw_newMediaObject( $args ) {
+        global $wpdb;
+
         $username = $this->escape( $args[1] );
         $password = $this->escape( $args[2] );
@@ -6110 +6112 @@
      * @since 1.5.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param int $post_ID
      * @return array|IXR_Error
      */
     public function mt_getTrackbackPings( $post_ID ) {
+        global $wpdb;
+
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
@@ -6122 +6128 @@
             return new IXR_Error(404, __('Sorry, no such post.'));
 
-        $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) );
+        $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) );
 
         if ( !$comments )
@@ -6257 +6263 @@
                 // ...or a string #title, a little more complicated
                 $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
-                $sql = $this->db->prepare("SELECT ID FROM {$this->db->posts} WHERE post_title RLIKE %s", $title );
-                if (! ($post_ID = $this->db->get_var($sql)) ) {
+                $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
+                if (! ($post_ID = $wpdb->get_var($sql)) ) {
                     // returning unknown error '0' is better than die()ing
                     return $this->pingback_error( 0, '' );
@@ -6282 +6288 @@
 
         // Let's check that the remote site didn't already pingback this entry
-        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) ) )
+        if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
             return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
 
@@ -6409 +6415 @@
      * @since 1.5.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param string $url
      * @return array|IXR_Error
      */
     public function pingback_extensions_getPingbacks( $url ) {
+        global $wpdb;
+
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
@@ -6431 +6441 @@
         }
 
-        $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) );
+        $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) );
 
         if ( !$comments )