sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Redirect to profile unless redirect, fixes #1240

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@2985 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Matt Mullenweg 2005-11-05 22:17:34 +00:00
parent be5caf3590
commit ee0398959b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-login.php
View File

@ -169,9 +169,9 @@ default:
$user_pass = $_POST['pwd']; $user_pass = $_POST['pwd'];
$rememberme = $_POST['rememberme']; $rememberme = $_POST['rememberme'];
} elseif ( !empty($_COOKIE) ) { } elseif ( !empty($_COOKIE) ) {
if (! empty($_COOKIE[USER_COOKIE]) ) if ( !empty($_COOKIE[USER_COOKIE]) )
$user_login = $_COOKIE[USER_COOKIE]; $user_login = $_COOKIE[USER_COOKIE];
if (! empty($_COOKIE[PASS_COOKIE]) ) { if ( !empty($_COOKIE[PASS_COOKIE]) ) {
$user_pass = $_COOKIE[PASS_COOKIE]; $user_pass = $_COOKIE[PASS_COOKIE];
$using_cookie = true; $using_cookie = true;
} }
@ -181,19 +181,19 @@ default:
if ($user_login && $user_pass) { if ($user_login && $user_pass) {
$user = new WP_User($user_login); $user = new WP_User($user_login);
// If the user can't edit posts, send them to their profile. // If the user can't edit posts, send them to their profile.
if ( ! $user->has_cap('edit_posts') ) if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php'; $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
if ( wp_login($user_login, $user_pass, $using_cookie) ) { if ( wp_login($user_login, $user_pass, $using_cookie) ) {
if ( !$using_cookie) { if ( !$using_cookie )
wp_setcookie($user_login, $user_pass, false, '', '', $rememberme); wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
}
do_action('wp_login', $user_login); do_action('wp_login', $user_login);
wp_redirect($redirect_to); wp_redirect($redirect_to);
exit(); exit;
} else { } else {
if ($using_cookie) if ( $using_cookie )
$error = __('Your session has expired.'); $error = __('Your session has expired.');
} }
} }