Changeset 13337

Timestamp:

02/23/2010 07:58:53 PM (11 years ago)

Author:

nacin

Message:

Ensure we have MS global tables defined during network install. See #11644

Location:

trunk

Files:

• wp-admin/network.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-admin/network.php

@@ -16 +16 @@
 if ( ! is_super_admin() )
     wp_die( __( 'You do not have sufficient permissions to manage options for this blog.' ) );
+
+// We need to create references to ms global tables to enable Network.
+foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
+    $wpdb->$table = $prefixed_table;
 
 $title = __( 'Network Settings' );

trunk/wp-includes/wp-db.php

@@ -626 +626 @@
      * @uses is_multisite()
      *
-     * @param string $scope Can be all, global, blog, or old tables. Default all.
+     * @param string $scope Can be all, global, ms_global, blog, or old tables. Default all.
      *  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.
-     * @return array Table names. When a prefix is requested, the key is the
-     *  unprefixed table name.
+     * @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 ) {
@@ -641 +640 @@
             case 'blog' :
                 $tables = $this->tables;
+                break;
+            case 'ms_global' :
+                $tables = $this->ms_global_tables;
                 break;
             case 'global' :