Changeset 9775

Timestamp:

11/19/2008 05:07:24 AM (16 years ago)

Author:

markjaquith

Message:

Do not redirect to options.php on login if user was POSTing to options.php from another page. props fitztrev. fixes #8133

File:

• trunk/wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -761 +761 @@
         $proto = 'http://';
 
-    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']), 'login' );
+    $redirect = ( strpos($_SERVER['REQUEST_URI'], '/options.php') && wp_get_referer() ) ? wp_get_referer() : $proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( $redirect ), 'login' );
 
     wp_redirect($login_url);