Changes from trunk/wp-admin/includes/upgrade.php at r15263 to branches/3.0/wp-admin/includes/upgrade.php at r15458

File:

• branches/3.0/wp-admin/includes/upgrade.php (modified) (3 diffs)

branches/3.0/wp-admin/includes/upgrade.php

@@ -153 +153 @@
                                 'link_notes' => '');
 
-    $default_links[] = array(   'link_url' => 'http://wordpress.org/development/',
+    $default_links[] = array(   'link_url' => 'http://wordpress.org/news/',
                                 'link_name' => 'WordPress Blog',
-                                'link_rss' => 'http://wordpress.org/development/feed/',
+                                'link_rss' => 'http://wordpress.org/news/feed/',
                                 'link_notes' => '');
 
@@ -1131 +1131 @@
 
     // 3.0 screen options key name changes.
-    if ( !is_multisite() || is_main_site() ) {
+    if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
         $prefix = like_escape($wpdb->base_prefix);
         $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
@@ -1400 +1400 @@
         // For every table in the database
         foreach ($tables as $table) {
+            // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
+            if ( in_array($table, $wpdb->tables('global')) && ( !is_main_site() || defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) )
+                continue;
+
             // If a table query exists for the database table...
             if ( array_key_exists(strtolower($table), $cqueries) ) {