Ticket #22803: 22803.2.diff

wp-includes/capabilities.php

@@ -1299 +1299 @@
  * @return bool
  */
 function current_user_can_for_blog( $blog_id, $capability ) {
-        switch_to_blog( $blog_id );
+        if ( is_multisite() )
+                switch_to_blog( $blog_id );
 
         $current_user = wp_get_current_user();
 
@@ -1311 +1312 @@
 
         $can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
 
-        restore_current_blog();
+        if ( is_multisite() )
+                restore_current_blog();
 
         return $can;
 }

wp-includes/class-wp-theme.php

@@ -1104 +1104 @@
         public static function get_allowed_on_site( $blog_id = null ) {
                 static $allowed_themes = array();
 
-                if ( ! $blog_id )
+                if ( ! $blog_id || ! is_multisite() )
                         $blog_id = get_current_blog_id();
 
                 if ( isset( $allowed_themes[ $blog_id ] ) )