Changeset 33858

Timestamp:

09/02/2015 05:19:29 PM (11 years ago)

Author:

johnbillion

Message:

Correctly encode spaces in URLs passed to esc_url() instead of removing them.

Fixes #23605
Props enshrined, johnbillion

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/EscUrl.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -3275 +3275 @@
         if ( '' == $url )
                 return $url;
+
+        $url = str_replace( ' ', '%20', $url );
         $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
         if ( 0 !== stripos( $url, 'mailto:' ) ) {
@@ -3280 +3282 @@
                 $url = _deep_replace($strip, $url);
         }
+
         $url = str_replace(';//', '://', $url);
         /* If the URL doesn't appear to contain a scheme, we

trunk/tests/phpunit/tests/formatting/EscUrl.php

@@ -5 +5 @@
  */
 class Tests_Formatting_EscUrl extends WP_UnitTestCase {
+
+        /**
+         * @ticket 23605
+         */
         function test_spaces() {
-                $this->assertEquals('http://example.com/MrWordPress', esc_url('http://example.com/Mr WordPress'));
-                $this->assertEquals('http://example.com/Mr%20WordPress', esc_url('http://example.com/Mr%20WordPress'));
+                $this->assertEquals( 'http://example.com/Mr%20WordPress',    esc_url( 'http://example.com/Mr WordPress' ) );
+                $this->assertEquals( 'http://example.com/Mr%20WordPress',    esc_url( 'http://example.com/Mr%20WordPress' ) );
+                $this->assertEquals( 'http://example.com/Mr%20%20WordPress', esc_url( 'http://example.com/Mr%20%20WordPress' ) );
+                $this->assertEquals( 'http://example.com/Mr+WordPress',      esc_url( 'http://example.com/Mr+WordPress' ) );
+
+                $this->assertEquals( 'http://example.com/?foo=one%20two%20three&bar=four', esc_url( 'http://example.com/?foo=one two three&bar=four' ) );
+                $this->assertEquals( 'http://example.com/?foo=one%20two%20three&bar=four', esc_url( 'http://example.com/?foo=one%20two%20three&bar=four' ) );
         }
 
@@ -137 +146 @@
                 $this->assertEquals( 'mailto:?body=Hi%20there%2C%0A%0AI%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );
         }
+
         /**
          * @ticket 31632
@@ -151 +161 @@
         }
 
+        /**
+         * @ticket 23605
+         */
+        function test_mailto_with_spaces() {
+                $body = 'Hi there, I thought you might want to sign up for this newsletter';
+
+                $email_link = 'mailto:?body=' . $body;
+                $email_link = esc_url( $email_link );
+                $this->assertEquals( 'mailto:?body=Hi%20there,%20I%20thought%20you%20might%20want%20to%20sign%20up%20for%20this%20newsletter', $email_link );
+        }
+
+
 }