Ticket #22262: 22262.diff

wp-includes/query.php

@@ -2406 +2406 @@
                 if ( 'any' == $post_type ) {
                         $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
                         if ( ! empty( $in_search_post_types ) )
-                                $where .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
+                                $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
                 } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
                         $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
                 } elseif ( ! empty( $post_type ) ) {

wp-includes/wp-db.php

@@ -987 +987 @@
          * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string
          *      if there was something to prepare
          */
-        function prepare( $query = null ) { // ( $query, *$args )
+        function prepare( $query = null, $arg ) {
                 if ( is_null( $query ) )
                         return;
 

wp-includes/ms-functions.php

@@ -1919 +1919 @@
         $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
         update_site_option( 'blog_count', $count );
 
-        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") );
+        $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
         update_site_option( 'user_count', $count );
 }