WordPress.org

Make WordPress Core

Ticket #16297: 16297.3.diff

File 16297.3.diff, 854 bytes (added by nacin, 7 years ago)
  • wp-login.php

     
    584584                }
    585585
    586586                // 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.
    587                 if ( is_multisite() && !get_active_blog_for_user($user->id) )
     587                if ( empty( $redirect_to ) && is_multisite() && !get_active_blog_for_user($user->id) )
    588588                        $redirect_to = user_admin_url();
    589                 elseif ( is_multisite() && !$user->has_cap('read') )
     589                elseif ( empty( $redirect_to ) && is_multisite() && !$user->has_cap('read') )
    590590                        $redirect_to = user_admin_url();
    591591                elseif ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
    592592                        $redirect_to = admin_url('profile.php');