Changes in trunk/wp-admin/includes/upgrade.php [14984:15211]

File:

• trunk/wp-admin/includes/upgrade.php (modified) (5 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -154 +154 @@
 
     $default_links[] = array(   'link_url' => 'http://wordpress.org/development/',
-                                'link_name' => 'Development Blog',
+                                'link_name' => 'WordPress Blog',
                                 'link_rss' => 'http://wordpress.org/development/feed/',
                                 'link_notes' => '');
@@ -441 +441 @@
         upgrade_290();
 
-    if ( $wp_current_db_version < 14984 )
+    if ( $wp_current_db_version < 15187 )
         upgrade_300();
 
@@ -1109 +1109 @@
     global $wp_current_db_version, $wpdb;
 
-    if ( $wp_current_db_version < 14984 )
+    if ( $wp_current_db_version < 15093 )
         populate_roles_300();
 
@@ -1130 +1130 @@
         $wpdb->update( $wpdb->postmeta, array( 'meta_value' => '' ), array( 'meta_key' => '_menu_item_target', 'meta_value' => '_self' ) );
 
-    // 3.0-beta metabox changes. can be removed before release (except metaboxorder). // r13551
-    if ( ( !is_multisite() || is_main_site() ) && $wp_current_db_version >= 13309 && $wp_current_db_version < 14726 ) {
+    // 3.0 screen options key name changes.
+    if ( !is_multisite() || is_main_site() ) {
         $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%'" );
+        $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%'
+                     OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden'" );
     }
 
@@ -1402 +1403 @@
             if ( array_key_exists(strtolower($table), $cqueries) ) {
                 // Clear the field and index arrays
-                unset($cfields);
-                unset($indices);
+                $cfields = $indices = array();
                 // Get all of the field names in the query from between the parens
                 preg_match("|\((.*)\)|ms", $cqueries[strtolower($table)], $match2);