Changeset 23117

Timestamp:

12/07/2012 09:53:27 AM (12 years ago)

Author:

ryan

Message:

Make current_user_can_for_blog() safe to run single site.

Props nacin, MarkJaquith
fixes #22803

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (2 diffs)
• class-wp-theme.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -1300 +1300 @@
  */
 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();
@@ -1312 +1313 @@
     $can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
 
-    restore_current_blog();
+    if ( is_multisite() )
+        restore_current_blog();
 
     return $can;

trunk/wp-includes/class-wp-theme.php

@@ -1105 +1105 @@
         static $allowed_themes = array();
 
-        if ( ! $blog_id )
+        if ( ! $blog_id || ! is_multisite() )
             $blog_id = get_current_blog_id();