WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redirect to profile unless redirect, fixes #1240 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-11-05 22:17:34 +00:00
parent 140f059191
commit db1941ba0b
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'];
$rememberme = $_POST['rememberme'];
} elseif ( !empty($_COOKIE) ) {
if (! empty($_COOKIE[USER_COOKIE]) )
if ( !empty($_COOKIE[USER_COOKIE]) )
$user_login = $_COOKIE[USER_COOKIE];
if (! empty($_COOKIE[PASS_COOKIE]) ) {
if ( !empty($_COOKIE[PASS_COOKIE]) ) {
$user_pass = $_COOKIE[PASS_COOKIE];
$using_cookie = true;
}
@ -181,19 +181,19 @@ default:
if ($user_login && $user_pass) {
$user = new WP_User($user_login);
// If the user can't edit posts, send them to their profile.
if ( ! $user->has_cap('edit_posts') )
$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
if ( wp_login($user_login, $user_pass, $using_cookie) ) {
if ( !$using_cookie) {
if ( !$using_cookie )
wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
}
do_action('wp_login', $user_login);
wp_redirect($redirect_to);
exit();
exit;
} else {
if ($using_cookie)
if ( $using_cookie )
$error = __('Your session has expired.');
}
}