Changeset 12757 for trunk

Timestamp:

01/19/2010 12:18:52 AM (15 years ago)

Author:

wpmuguru

Message:

options network page, db variable change, See #11644

Location:

trunk

Files:

• wp-admin/menu.php (modified) (1 diff)
• wp-admin/options-network.php (added)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/menu.php

@@ -159 +159 @@
     if ( is_super_admin() )
         $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
+    if ( !is_multisite() && is_super_admin() ) {
+        $submenu['options-general.php'][50] = array(__('Network'), 'manage_options', 'options-network.php');
+    }
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group

trunk/wp-includes/wp-db.php

@@ -492 +492 @@
         if ( $blog_id ) {
                         if( defined('MULTISITE') && ( $blog_id == 0 || $blog_id == 1) ) {
-                    return $this->prefix;
+                    return $this->base_prefix;
                         } else {
                     return $this->base_prefix . $blog_id . '_';