Changeset 34915

Timestamp:

10/07/2015 09:42:36 PM (10 years ago)

Author:

johnbillion

Message:

Correctly encode the url parameter that gets passed to WordPress' own oEmbed endpoint URL.

Fixes #34193
Props ocean90

Location:

trunk

Files:

• src/wp-includes/embed-functions.php (modified) (1 diff)
• tests/phpunit/tests/oembed/controller.php (modified) (2 diffs)

trunk/src/wp-includes/embed-functions.php

@@ -424 +424 @@
     if ( '' !== $permalink ) {
         $url = add_query_arg( array(
-            'url'    => $permalink,
+            'url'    => urlencode( $permalink ),
             'format' => $format,
         ), $url );

trunk/tests/phpunit/tests/oembed/controller.php

@@ -183 +183 @@
 
         $post = $this->factory->post->create_and_get( array(
-            'post_title'  => 'Hello Child Blog',
-        ) );
-
-        $request = array(
-            'url'      => get_permalink( $post->ID ),
+            'post_title' => 'Hello Child Blog',
+        ) );
+
+        $request = array(
+            'url'      => get_permalink( $post->ID ),
             'format'   => 'json',
             'maxwidth' => 600,
@@ -208 +208 @@
         $this->assertEquals( home_url() . '/?oembed=true', get_oembed_endpoint_url( '', 'xml' ) );
 
-        $post_id = $this->factory->post->create();
-        $url     = get_permalink( $post_id );
-
-        $this->assertEquals( home_url() . '/?oembed=true&url=' . $url, get_oembed_endpoint_url( $url ) );
-        $this->assertEquals( home_url() . '/?oembed=true&url=' . $url . '&format=xml', get_oembed_endpoint_url( $url, 'xml' ) );
+        $post_id     = $this->factory->post->create();
+        $url         = get_permalink( $post_id );
+        $url_encoded = urlencode( $url );
+
+        $this->assertEquals( home_url() . '/?oembed=true&url=' . $url_encoded, get_oembed_endpoint_url( $url ) );
+        $this->assertEquals( home_url() . '/?oembed=true&url=' . $url_encoded . '&format=xml', get_oembed_endpoint_url( $url, 'xml' ) );
     }