Changeset 12952

Timestamp:

02/04/2010 07:26:38 PM (11 years ago)

Author:

wpmuguru

Message:

add siteurl filter for ms upgrades, props nacin, fixes #12069

Location:

trunk

Files:

• wp-admin/ms-upgrade-site.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/ms-upgrade-site.php

@@ -34 +34 @@
             foreach ( (array) $blogs as $details ) {
                 if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
-                    $blog_prefix = $wpdb->get_blog_prefix( $details[ 'blog_id' ] );
-                    $siteurl = $wpdb->get_var( "SELECT option_value from {$blog_prefix}options WHERE option_name = 'siteurl'" );
+                    $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
                     echo "<li>$siteurl</li>";
                     $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );

trunk/wp-includes/ms-functions.php

@@ -273 +273 @@
 
     if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
-        $value = preg_replace( '|/+$|', '', $value );
+        $value = untrailingslashit( $value );
 
     if (! @unserialize( $value ) )