Changeset 18328

Timestamp:

06/22/2011 07:45:28 PM (14 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

Location:

trunk

Files:

• wp-includes/link-template.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

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 {

trunk/wp-login.php

@@ -587 +587 @@
         if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
             // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-            if ( is_multisite() && !get_active_blog_for_user($user->id) )
+            if ( is_multisite() && !get_active_blog_for_user($user->id) && !is_super_admin( $user->id ) )
                 $redirect_to = user_admin_url();
             elseif ( is_multisite() && !$user->has_cap('read') )