Changeset 13465

Timestamp:

02/27/2010 06:21:03 PM (13 years ago)

Author:

nacin

Message:

Add redirect_to and associated filters to registration and password recovery. fixes #12282

File:

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

trunk/wp-login.php

@@ -360 +360 @@
     wp_logout();
 
-    $redirect_to = 'wp-login.php?loggedout=true';
-    if ( isset( $_REQUEST['redirect_to'] ) )
-        $redirect_to = $_REQUEST['redirect_to'];
-
-    wp_safe_redirect($redirect_to);
+    $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
+    wp_safe_redirect( $redirect_to );
     exit();
 
@@ -374 +371 @@
         $errors = retrieve_password();
         if ( !is_wp_error($errors) ) {
-            wp_redirect('wp-login.php?checkemail=confirm');
+            $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
+            wp_safe_redirect( $redirect_to );
             exit();
         }
@@ -380 +378 @@
 
     if ( isset($_GET['error']) && 'invalidkey' == $_GET['error'] ) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
+    $redirect_to = apply_filters( 'lostpassword_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
 
     do_action('lost_password');
@@ -394 +393 @@
     </p>
 <?php do_action('lostpassword_form'); ?>
+    <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
     <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
 </form>
@@ -435 +435 @@
 case 'register' :
     if ( is_multisite() ) {
-        // WPMU doesn't use this
+        // Multisite uses wp-signup.php
         wp_redirect( apply_filters( 'wp_signup_location', get_bloginfo('wpurl') . '/wp-signup.php' ) );
         exit;
@@ -454 +454 @@
         $errors = register_new_user($user_login, $user_email);
         if ( !is_wp_error($errors) ) {
-            wp_redirect('wp-login.php?checkemail=registered');
+            $redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
+            wp_safe_redirect( $redirect_to );
             exit();
         }
     }
 
+    $redirect_to = apply_filters( 'registration_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
     login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
 ?>
@@ -474 +476 @@
     <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
     <br class="clear" />
+    <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
     <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Register'); ?>" tabindex="100" /></p>
 </form>