Changeset 17351

Timestamp:

01/22/2011 06:29:43 PM (14 years ago)

Author:

ryan

Message:

Don't try to redirect to user admin for unpriv users unless a site admin redirect was requested. fixes #16297

File:

• trunk/wp-login.php (modified) (1 diff)

trunk/wp-login.php

@@ -584 +584 @@
         }
 
-        // 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) )
-            $redirect_to = user_admin_url();
-        elseif ( is_multisite() && !$user->has_cap('read') )
-            $redirect_to = user_admin_url();
-        elseif ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
-            $redirect_to = admin_url('profile.php');
+        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) )
+                $redirect_to = user_admin_url();
+            elseif ( is_multisite() && !$user->has_cap('read') )
+                $redirect_to = user_admin_url();
+            elseif ( !$user->has_cap('edit_posts') )
+                $redirect_to = admin_url('profile.php');
+        }
         wp_safe_redirect($redirect_to);
         exit();