Ticket #33929: 33929.patch

wp-includes/ms-functions.php

@@ -374 +374 @@
         elseif ( $id )
                 return (int) $id;
 
-        $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+        $id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
 
         if ( ! $id ) {
                 wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
@@ -1321 +1321 @@
 function domain_exists($domain, $path, $site_id = 1) {
         global $wpdb;
         $path = trailingslashit( $path );
-        $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+        $result = (int) $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
 
         /**
          * Filter whether a blogname is taken.
@@ -1333 +1333 @@
          * @param string   $path    Path to be checked.
          * @param int      $site_id Site ID. Relevant only on multi-network installs.
          */
-        return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+        return (int) apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
 }
 
 /**
@@ -1863 +1863 @@
         $term_id = intval( $term_id );
         $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
 
-        $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-        if ( $global_id == null ) {
+        $global_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
+        if ( $global_id === 0 ) {
                 $used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
                 if ( null == $used_global_id ) {
                         $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
@@ -1878 +1878 @@
                         $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
                         $global_id = $wpdb->insert_id;
                 }
-        } elseif ( $global_id != $term_id ) {
+        } elseif ( $global_id !== $term_id ) {
                 $local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
                 if ( null != $local_id ) {
                         global_terms( $local_id );

wp-includes/user-functions.php

@@ -271 +271 @@
 
         $where = get_posts_by_author_sql( $post_type, true, $userid, $public_only );
 
-        $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
+        $count = (int) $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
 
         /**
          * Filter the number of posts a user has written.
@@ -285 +285 @@
          * @param string|array $post_type   Single post type or array of post types to count the number of posts for.
          * @param bool         $public_only Whether to limit counted posts to public posts.
          */
-        return apply_filters( 'get_usernumposts', $count, $userid, $post_type, $public_only );
+        return (int) apply_filters( 'get_usernumposts', $count, $userid, $post_type, $public_only );
 }
 
 /**

wp-includes/ms-blogs.php

@@ -91 +91 @@
                 $path = $current_site->path . $slug . '/';
         }
 
-        $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
+        $blog_id = (int) $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
         wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
         return $blog_id;
 }

wp-includes/class-wp-user-query.php

@@ -437 +437 @@
                  * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
                  */
                 if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-                        $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+                        $this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
 
                 if ( !$this->results )
                         return;

wp-includes/media.php

@@ -3476 +3476 @@
                 "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
                 $path
         );
-        $post_id = $wpdb->get_var( $sql );
+        $post_id = (int) $wpdb->get_var( $sql );
 
         /**
          * Filter an attachment id found by URL.