Changeset 18328 for trunk/wp-includes/link-template.php

Timestamp:

06/22/2011 07:45:28 PM (15 years ago)

Author:

ryan

Message:

Fix handing of super admins that don't have a blog in get_dashboard_url() and login. Props nacin. fixes #17829

File:

• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -2303 +2303 @@
 
         $blogs = get_blogs_of_user( $user_id );
-        if ( empty($blogs) ) {
+        if ( ! is_super_admin() && empty($blogs) ) {
                 $url = user_admin_url( $path, $scheme );
         } elseif ( ! is_multisite() ) {
@@ -2309 +2309 @@
         } else {
                 $current_blog = get_current_blog_id();
-                if ( $current_blog  && in_array($current_blog, array_keys($blogs)) ) {
+                if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
                         $url = admin_url( $path, $scheme );
                 } else {