From cc6e217d1d1e9946dd219e780e258c243aa8af0a Mon Sep 17 00:00:00 2001 From: nacin Date: Tue, 23 Feb 2010 20:38:41 +0000 Subject: [PATCH] Fall back to $wpdb::blogid, not main blog id, in wpdb->tables(). See #11644 git-svn-id: http://svn.automattic.com/wordpress/trunk@13341 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/wp-db.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index db252f5d6..08f2eec8c 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -629,7 +629,7 @@ class wpdb { * All returns the blog tables for the queried blog and all global tables. * @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. */ function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) { @@ -656,6 +656,8 @@ class wpdb { } if ( $prefix ) { + if ( ! $blog_id ) + $blog_id = $this->blogid; $prefix = $this->get_blog_prefix( $blog_id ); $base_prefix = $this->base_prefix; $global_tables = array_merge( $this->global_tables, $this->ms_global_tables );