Changeset 2985

Timestamp:

11/05/05 22:17:34 (3 years ago)

Author:

matt

Message:

Redirect to profile unless redirect, fixes #1240

Files:

• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-login.php

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