From 6bd0ae83a3f47053e2b5b1e343ac01ef59e94af7 Mon Sep 17 00:00:00 2001 From: matt Date: Wed, 14 Sep 2005 20:57:21 +0000 Subject: [PATCH] Allow for more redirect flexibility git-svn-id: http://svn.automattic.com/wordpress/trunk@2876 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-login.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-login.php b/wp-login.php index 6d30e826ee..788a770372 100644 --- a/wp-login.php +++ b/wp-login.php @@ -157,14 +157,17 @@ default: $user_login = ''; $user_pass = ''; - $redirect_to = 'wp-admin/'; $using_cookie = false; + if ( !isset( $_REQUEST['redirect_to'] ) ) + $redirect_to = 'wp-admin/'; + else + $redirect_to = $_REQUEST['redirect_to']; + $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $redirect_to); if( !empty($_POST) ) { $user_login = $_POST['log']; $user_pass = $_POST['pwd']; $rememberme = $_POST['rememberme']; - $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']); } elseif ( !empty($_COOKIE) ) { if (! empty($_COOKIE[USER_COOKIE]) ) $user_login = $_COOKIE[USER_COOKIE]; @@ -194,8 +197,6 @@ default: $error = __('Your session has expired.'); } } - if ( isset($_REQUEST['redirect_to']) ) - $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_REQUEST['redirect_to']); ?>