WordPress 4.0.1-scripts

[autoinstalls/wordpress.git] / wp-login.php

diff --git a/wp-login.php b/wp-login.php
index b9dbd61e52b4ea5fb93c9b0c47decc66db43bdd9..5ab6fc6752d4ff6be159bf9cf58fb2c5719e3313 100644 (file)
--- a/wp-login.php
+++ b/wp-login.php
@@ -571,6 +571,9 @@ case 'rp' :
        if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
                list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
                $user = check_password_reset_key( $rp_key, $rp_login );
+               if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+                       $user = false;
+               }
        } else {
                $user = false;
        }
@@ -640,6 +643,7 @@ case 'rp' :
         */
        do_action( 'resetpass_form', $user );
        ?>
+       <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p>
 </form>