Ticket #42957: 42957.diff

src/wp-includes/functions.php

@@ -7559 +7559 @@
         return $direct_update_url;
 }
 
+/**
+ * Encode this url, like rawurlencode. If it ends in a period, replace that with %2E.
+ * This is done because gmail doesn't interpret it right otherwise.
+ * See https://core.trac.wordpress.org/ticket/42957 for background.
+ *
+ * @param string  $url Any url.
+ * @return string Encoded url.
+ */
+function wp_half_baked_url_encode( $url ) {
+        return preg_replace( '/\.$/', '%2E', rawurlencode( $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=" . wp_half_baked_url_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=" . wp_half_baked_url_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 @@
+<?php
+
+/**
+ * Tests for wp_half_baked_url_encode()
+ *
+ * @ticket 42957
+ *
+ * @group functions.php
+ * @covers ::wp_half_baked_url_encode
+ */
+class Tests_Functions_WpHalfBakedUrlEncode extends WP_UnitTestCase {
+
+        public function _data_wp_half_baked_url_encode() {
+                return array(
+                        array( '', '' ),
+                        array( '.', '%2E' ),
+                        array( '..', '.%2E' ),
+                        array( '...', '..%2E' ),
+                        array( 'Ending period.', 'Ending%20period%2E' ),
+                        array( 'Middle.period', 'Middle.period' ),
+                        array( 'No period', 'No%20period' ),
+                        array( 'Two.periods.', 'Two.periods%2E' ),
+                );
+        }
+
+        /**
+         * @dataProvider _data_wp_half_baked_url_encode
+         *
+         * @param $input_url
+         * @param $expected
+         */
+        public function test_size_format( $input_url, $expected ) {
+                $this->assertSame( $expected, wp_half_baked_url_encode( $input_url ) );
+        }
+}