Changeset 13618

Timestamp:

03/08/2010 04:31:12 PM (16 years ago)

Author:

wpmuguru

Message:

move multisite upgrade functions to upgrade.php, see #11771

Location:

trunk

Files:

• . (modified) (1 prop)
• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -735 +735 @@
 }
 
-function stripslashes_from_options( $blog_id ) {
-    global $wpdb;
-
-    if ( $blog_id == 1 ) { // check site_options too
-        $start = 0;
-        while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
-            foreach( $rows as $row ) {
-                $value = $row->meta_value;
-                if ( !@unserialize( $value ) )
-                    $value = stripslashes( $value );
-                if ( $value !== $row->meta_value ) {
-                    update_site_option( $row->meta_key, $value );
-                }
-            }
-            $start += 20;
-        }
-    }
-    $start = 0;
-    $options_table = $wpdb->get_blog_prefix( $blog_id ) . "options";
-    while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $options_table ORDER BY option_id LIMIT $start, 20" ) ) {
-        foreach( $rows as $row ) {
-            $value = $row->option_value;
-            if ( !@unserialize( $value ) )
-                $value = stripslashes( $value );
-            if ( $value !== $row->option_value ) {
-                update_blog_option( $blog_id, $row->option_name, $value );
-            }
-        }
-        $start += 20;
-    }
-    refresh_blog_details( $blog_id );
-}
-add_action( 'wpmu_upgrade_site', 'stripslashes_from_options' );
-
 function show_post_thumbnail_warning() {
     if ( ! is_super_admin() )

trunk/wp-admin/includes/upgrade.php

@@ -1062 +1062 @@
  */
 function upgrade_280() {
-    global $wp_current_db_version;
+    global $wp_current_db_version, $wpdb;
 
     if ( $wp_current_db_version < 10360 )
         populate_roles_280();
+    if ( is_multisite() ) {
+        $start = 0;
+        while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
+            foreach( $rows as $row ) {
+                $value = $row->option_value;
+                if ( !@unserialize( $value ) )
+                    $value = stripslashes( $value );
+                if ( $value !== $row->option_value ) {
+                    update_option( $row->option_name, $value );
+                }
+            }
+            $start += 20;
+        }
+        refresh_blog_details( $wpdb->blogid );
+    }
 }
 
@@ -1106 +1121 @@
  */
 function upgrade_network() {
-    global $wp_current_db_version;
+    global $wp_current_db_version, $wpdb;
     // 2.8
     if ( $wp_current_db_version < 11549 ) {
@@ -1121 +1136 @@
         delete_site_option( 'wpmu_sitewide_plugins' );
         delete_site_option( 'deactivated_sitewide_plugins' );
+
+        $start = 0;
+        while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
+            foreach( $rows as $row ) {
+                $value = $row->meta_value;
+                if ( !@unserialize( $value ) )
+                    $value = stripslashes( $value );
+                if ( $value !== $row->meta_value ) {
+                    update_site_option( $row->meta_key, $value );
+                }
+            }
+            $start += 20;
+        }
     }
 }