From 830efa533912e731fc83fad0923350458caa1820 Mon Sep 17 00:00:00 2001
From: Ron Rennick <wpmuguru@git.wordpress.org>
Date: Mon, 8 Mar 2010 16:31:12 +0000
Subject: [PATCH] move multisite upgrade functions to upgrade.php, see #11771

git-svn-id: https://develop.svn.wordpress.org/trunk@13618 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/ms.php      | 34 ----------------------------------
 wp-admin/includes/upgrade.php | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index b8e4042994..a5e24f9663 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -734,40 +734,6 @@ function choose_primary_blog() {
 	<?php
 }
 
-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() )
 		return;
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 1441cd18d3..28d27f5d2e 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1061,10 +1061,25 @@ function upgrade_270() {
  * @since 2.8.0
  */
 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 );
+	}
 }
 
 /**
@@ -1105,7 +1120,7 @@ function upgrade_300() {
  * @since 3.0.0
  */
 function upgrade_network() {
-	global $wp_current_db_version;
+	global $wp_current_db_version, $wpdb;
 	// 2.8
 	if ( $wp_current_db_version < 11549 ) {
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
@@ -1120,6 +1135,19 @@ function upgrade_network() {
 		}
 		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;
+		}
 	}
 }