golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@13618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-03-08 16:31:12 +00:00
parent 9c3f4265ab
commit 6b18130fb2
2 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wp-admin/includes/ms.php
View File

@ -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;

32
wp-admin/includes/upgrade.php
View File

@ -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;
}
}
}