Changeset 13341

Timestamp:

02/23/2010 08:38:41 PM (15 years ago)

Author:

nacin

Message:

Fall back to $wpdb::blogid, not main blog id, in wpdb->tables(). See #11644

File:

• trunk/wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-includes/wp-db.php

@@ -630 +630 @@
      * @param bool $prefix Whether to include table prefixes. Default true. If blog
      *  prefix is requested, then the custom users and usermeta tables will be mapped.
-     * @param int $blog_id The blog_id to prefix. Defaults to main blog. Used only when prefix is requested.
+     * @param int $blog_id The blog_id to prefix. Defaults to wpdb::blogid. Used only when prefix is requested.
      * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
      */
@@ -657 +657 @@
 
         if ( $prefix ) {
+            if ( ! $blog_id )
+                $blog_id = $this->blogid;
             $prefix = $this->get_blog_prefix( $blog_id );
             $base_prefix = $this->base_prefix;