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

Timestamp:

08/18/2016 06:20:55 PM (10 years ago)

Author:

wonderboymusic

Message:

Query: add a protected field, $db, (composition, as it were) to WP_*_Query classes to hold the value for the database abstraction, instead of importing the global $wpdb into every method that uses it. Reduces the number of global imports by 32.

See #37699.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (17 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.
          *
@@ -64 +71 @@
          */
         public function __construct() {
+                $this->db = $GLOBALS['wpdb'];
+
                 $this->methods = array(
                         // WordPress API
@@ -2883 +2892 @@
          * @since 2.2.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array  $args {
          *     Method arguments. Note: arguments must be ordered as documented.
@@ -2895 +2902 @@
          */
         public function wp_getPageList( $args ) {
-                global $wpdb;
-
                 $this->escape( $args );
 
@@ -2912 +2917 @@
 
                 // Get list of pages ids and titles
-                $page_list = $wpdb->get_results("
+                $page_list = $this->db->get_results("
                         SELECT ID page_id,
                                 post_title page_title,
@@ -2919 +2924 @@
                                 post_date,
                                 post_status
-                        FROM {$wpdb->posts}
+                        FROM {$this->db->posts}
                         WHERE post_type = 'page'
                         ORDER BY ID
@@ -5131 +5136 @@
          * @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 = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
+                $attachments = $this->db->get_results( "SELECT ID, guid FROM {$this->db->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 )
-                                        $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+                                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 ) );
+                                }
                         }
                 }
@@ -5764 +5766 @@
          * @since 1.5.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array  $args {
          *     Method arguments. Note: arguments must be ordered as documented.
@@ -5777 +5777 @@
          */
         public function mw_newMediaObject( $args ) {
-                global $wpdb;
-
                 $username = $this->escape( $args[1] );
                 $password = $this->escape( $args[2] );
@@ -6103 +6101 @@
          * @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' );
@@ -6119 +6113 @@
                         return new IXR_Error(404, __('Sorry, no such post.'));
 
-                $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) );
+                $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) );
 
                 if ( !$comments )
@@ -6193 +6187 @@
          * @since 1.5.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
          * @global string $wp_version
          *
@@ -6205 +6198 @@
          */
         public function pingback_ping( $args ) {
-                global $wpdb, $wp_version;
+                global $wp_version;
 
                 /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
@@ -6259 +6252 @@
                                 // ...or a string #title, a little more complicated
                                 $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
-                                $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
-                                if (! ($post_ID = $wpdb->get_var($sql)) ) {
+                                $sql = $this->db->prepare("SELECT ID FROM {$this->db->posts} WHERE post_title RLIKE %s", $title );
+                                if (! ($post_ID = $this->db->get_var($sql)) ) {
                                         // returning unknown error '0' is better than die()ing
                                         return $this->pingback_error( 0, '' );
@@ -6284 +6277 @@
 
                 // Let's check that the remote site didn't already pingback this entry
-                if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
+                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) ) )
                         return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
 
@@ -6409 +6402 @@
          * @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' );
@@ -6435 +6424 @@
                 }
 
-                $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) );
+                $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) );
 
                 if ( !$comments )