Ticket #21459: 21459-no-switched.2.diff

wp-includes/functions.php

@@ -1432 +1432 @@
  * @return array See above for description.
  */
 function wp_upload_dir( $time = null ) {
-        global $_wp_switched;
         $siteurl = get_option( 'siteurl' );
         $upload_path = get_option( 'upload_path' );
         $upload_path = trim($upload_path);
@@ -1456 +1455 @@
                         $url = trailingslashit( $siteurl ) . $upload_path;
         }
 
-        if ( defined('UPLOADS') && ! $main_override && ! $_wp_switched ) {
+        if ( defined('UPLOADS') && ! $main_override && ! ms_is_switched() ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
 
-        if ( is_multisite() && ! $main_override && ! $_wp_switched  ) {
+        if ( is_multisite() && ! $main_override && ! ms_is_switched()  ) {
                 if ( defined( 'BLOGUPLOADDIR' ) )
                         $dir = untrailingslashit(BLOGUPLOADDIR);
                 $url = str_replace( UPLOADS, 'files', $url );

wp-includes/ms-blogs.php

@@ -462 +462 @@
         * the extra unnecessary work */
         if ( $new_blog == $GLOBALS['blog_id'] ) {
                 do_action( 'switch_blog', $new_blog, $new_blog );
-                $GLOBALS['_wp_switched'] = true;
                 return true;
         }
 
@@ -499 +498 @@
         }
 
         do_action( 'switch_blog', $new_blog, $prev_blog_id );
-        $GLOBALS['_wp_switched'] = true;
 
         return true;
 }
@@ -515 +513 @@
 function restore_current_blog() {
         global $wpdb, $wp_roles;
 
-        if ( ! $GLOBALS['_wp_switched'] )
+        if ( empty( $GLOBALS['_wp_switched_stack'] ) )
                 return false;
 
         $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
 
         if ( $GLOBALS['blog_id'] == $blog ) {
                 do_action( 'switch_blog', $blog, $blog );
-                // If we still have items in the switched stack, consider ourselves still 'switched'
-                $GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
                 return true;
         }
 
@@ -560 +556 @@
         }
 
         do_action( 'switch_blog', $blog, $prev_blog_id );
-
-        // If we still have items in the switched stack, consider ourselves still 'switched'
-        $GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
-
         return true;
 }
 
@@ -575 +567 @@
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-        return $GLOBALS['_wp_switched'];
+        return ! empty( $GLOBALS['_wp_switched_stack'] );
 }
 
 /**

wp-includes/ms-settings.php

@@ -127 +127 @@
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
-$_wp_switched = false;
 
 // need to init cache again after blog_id is set
 wp_start_object_cache();