Ticket #34523: 34523.2.diff

src/wp-includes/class-wp-oembed-controller.php

@@ -67 +67 @@
                 $post_id = url_to_postid( $request['url'] );
 
                 /**
-                 * Filter the determined post id.
+                 * Filter the determined post ID.
                  *
                  * @since 4.4.0
                  *
                  * @param int    $post_id The post ID.
-                 * @param string $url     The requestd URL.
+                 * @param string $url     The requested URL.
                  */
                 $post_id = apply_filters( 'oembed_request_post_id', $post_id, $request['url'] );
 

src/wp-includes/embed-functions.php

@@ -446 +446 @@
  *
  * @since 4.4.0
  *
- * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @param int         $width  The width for the response.
  * @param int         $height The height for the response.
+ * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @return string|false Embed code on success, false if post doesn't exist.
  */
-function get_post_embed_html( $post = null, $width, $height ) {
+function get_post_embed_html( $width, $height, $post = null ) {
         $post = get_post( $post );
 
         if ( ! $post ) {
@@ -510 +510 @@
  *
  * @since 4.4.0
  *
- * @param WP_Post|int $post  Optional. Post object or ID. Default is global `$post`.
+ * @param WP_Post|int $post  Post object or ID.
  * @param int         $width The requested width.
  * @return array|false Response data on success, false if post doesn't exist.
  */
-function get_oembed_response_data( $post = null, $width ) {
+function get_oembed_response_data( $post, $width ) {
         $post = get_post( $post );
 
         if ( ! $post ) {
@@ -590 +590 @@
         $data['width']  = absint( $width );
         $data['height'] = absint( $height );
         $data['type']   = 'rich';
-        $data['html']   = get_post_embed_html( $post, $width, $height );
+        $data['html']   = get_post_embed_html( $width, $height, $post );
 
         // Add post thumbnail to response if available.
         $thumbnail_id = false;

src/wp-includes/embed-template.php

@@ -184 +184 @@
                                                         </p>
                                                 </div>
                                                 <div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-labelledby="wp-embed-share-tab-button-html" aria-hidden="true">
-                                                        <textarea class="wp-embed-share-input" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( null, 600, 400 ) ); ?></textarea>
+                                                        <textarea class="wp-embed-share-input" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
 
                                                         <p class="wp-embed-share-description">
                                                                 <?php _e( 'Copy and paste this code into your site to embed' ); ?>

tests/phpunit/tests/oembed/getResponseData.php

@@ -25 +25 @@
                         'type'          => 'rich',
                         'width'         => 400,
                         'height'        => 225,
-                        'html'          => get_post_embed_html( $post, 400, 225 ),
+                        'html'          => get_post_embed_html( 400, 225, $post ),
                 ), $data );
         }
 
@@ -54 +54 @@
                         'type'          => 'rich',
                         'width'         => 400,
                         'height'        => 225,
-                        'html'          => get_post_embed_html( $post, 400, 225 ),
+                        'html'          => get_post_embed_html( 400, 225, $post ),
                 ), $data );
         }
 

tests/phpunit/tests/oembed/template.php

@@ -236 +236 @@
         }
 
         function test_get_post_embed_html_non_existent_post() {
-                $this->assertFalse( get_post_embed_html( 0, 200, 200 ) );
-                $this->assertFalse( get_post_embed_html( null, 200, 200 ) );
+                $this->assertFalse( get_post_embed_html( 200, 200, 0 ) );
+                $this->assertFalse( get_post_embed_html( 200, 200 ) );
         }
 
         function test_get_post_embed_html() {
@@ -245 +245 @@
 
                 $expected = '<iframe sandbox="allow-scripts" security="restricted" src="' . esc_url( get_post_embed_url( $post_id ) ) . '" width="200" height="200" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>';
 
-                $this->assertStringEndsWith( $expected, get_post_embed_html( $post_id, 200, 200 ) );
+                $this->assertStringEndsWith( $expected, get_post_embed_html( 200, 200, $post_id ) );
         }
 
         function test_add_host_js() {