Ticket #42957: 42957.diff

src/wp-includes/functions.php

@@ -7559 +7559 @@
         return $direct_update_url;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 /**
  * Display a button directly linking to a PHP update process.
  *

src/wp-includes/pluggable.php

@@ -2082 +2082 @@
                 /* translators: %s: User login. */
                 $message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
                 $message .= __( 'To set your password, visit the following address:' ) . "\r\n\r\n";
-                $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user->user_login ), 'login' ) . "\r\n\r\n";
+                $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . encode( $user->user_login ), 'login' ) . "\r\n\r\n";
 
                 $message .= wp_login_url() . "\r\n";
 

src/wp-includes/user.php

@@ -2771 +2771 @@
         $message .= sprintf( __( 'Username: %s' ), $user_login ) . "\r\n\r\n";
         $message .= __( 'If this was a mistake, ignore this email and nothing will happen.' ) . "\r\n\r\n";
         $message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
-        $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . "\r\n\r\n";
+        $message .= network_site_url( "wp-login.php?action=rp&key=$key&login=" . encode( $user_login ), 'login' ) . "\r\n\r\n";
 
         if ( ! is_user_logged_in() ) {
                 $requester_ip = $_SERVER['REMOTE_ADDR'];

new file tests/phpunit/tests/functions/wpHalfBakedUrlEncode.php

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+