summaryrefslogtreecommitdiffstats
path: root/wp-admin/upgrade-functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-06-21 16:41:02 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-06-21 16:41:02 +0000
commita5fe68e002632c190ffbd85167671ed4d4961135 (patch)
treeae57f94603111507c50cb3c212a03bedf8f7dc5a /wp-admin/upgrade-functions.php
parent4e38776b5b68c61a4593a84340f4654200f7568e (diff)
downloadwordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.gz
wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.tar.xz
wordpress-mu-a5fe68e002632c190ffbd85167671ed4d4961135.zip
WP Merge to WP 2.2.1
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/upgrade-functions.php')
-rw-r--r--wp-admin/upgrade-functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 0e8e071..d162e58 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -175,6 +175,8 @@ function upgrade_all() {
upgrade_110();
upgrade_130();
}
+
+ maybe_disable_automattic_widgets();
if ( $wp_current_db_version < 3308 )
upgrade_160();
@@ -184,8 +186,6 @@ function upgrade_all() {
if ( $wp_current_db_version < 4351 )
upgrade_old_slugs();
-
- maybe_disable_automattic_widgets();
$wp_rewrite->flush_rules();