Ticket #12282: redirect.patch

wp-login.php

@@ -422 +422 @@
 case 'rp' :
         $errors = reset_password($_GET['key'], $_GET['login']);
 
-        if ( ! is_wp_error($errors) ) {
-                wp_redirect('wp-login.php?checkemail=newpass');
+        if ( !is_wp_error($errors) ) {
+                if ( isset( $_REQUEST['redirect_to'] ) ) {
+                        wp_safe_redirect($_REQUEST['redirect_to']);
+                } else {
+                        wp_redirect('wp-login.php?checkemail=newpass');
+                }
                 exit();
         }
 
@@ -452 +456 @@
                 $user_login = $_POST['user_login'];
                 $user_email = $_POST['user_email'];
                 $errors = register_new_user($user_login, $user_email);
-                if ( !is_wp_error($errors) ) {
-                        wp_redirect('wp-login.php?checkemail=registered');
-                        exit();
-                }
+        if ( !is_wp_error($errors) ) {
+                if ( isset( $_REQUEST['redirect_to'] ) ) {
+                        wp_safe_redirect($_REQUEST['redirect_to']);
+                } else {
+                        wp_redirect('wp-login.php?checkemail=registered');
+                }
+                exit();
+        }
         }
 
         login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);