Changeset 22428

Timestamp:

11/07/2012 07:28:08 PM (12 years ago)

Author:

nacin

Message:

Remove single-argument calls to wpdb:prepare(), which are invalid as nothing is being prepared. see #22262.

Location:

trunk/wp-includes

Files:

• ms-functions.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1920 +1920 @@
     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 );
 }

trunk/wp-includes/query.php

@@ -2407 +2407 @@
             $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) . "')";