Ticket #59185: 59185.patch

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

@@ -6370 +6370 @@
          *
          * @since 1.5.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array $args {
          *     Method arguments. Note: arguments must be ordered as documented.
          *
@@ -6383 +6381 @@
          * @return array|IXR_Error
          */
         public function mw_newMediaObject( $args ) {
-                global $wpdb;
 
                 $username = $this->escape( $args[1] );
                 $password = $this->escape( $args[2] );

wp-includes/user.php

@@ -2953 +2953 @@
  *
  * @since 3.1.0
  *
- * @global wpdb         $wpdb      WordPress database object for queries.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
  *
  * @param string $key       Hash to validate sending user's password.
@@ -2961 +2960 @@
  * @return WP_User|WP_Error WP_User object on success, WP_Error object for invalid or expired keys.
  */
 function check_password_reset_key( $key, $login ) {
-        global $wpdb, $wp_hasher;
+        global $wp_hasher;
 
         $key = preg_replace( '/[^a-z0-9]/i', '', $key );