Changeset 35472

Timestamp:

10/31/2015 03:50:23 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Embeds: In get_post_embed_html(), move the optional $post argument after the required $width and $height.

Props swissspidy.
Fixes #34523.

Location:

trunk

Files:

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

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

@@ -447 +447 @@
  * @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 );
 
@@ -591 +591 @@
     $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.

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

@@ -185 +185 @@
                         </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">

trunk/tests/phpunit/tests/oembed/getResponseData.php

@@ -26 +26 @@
             'width'         => 400,
             'height'        => 225,
-            'html'          => get_post_embed_html( $post, 400, 225 ),
+            'html'          => get_post_embed_html( 400, 225, $post ),
         ), $data );
     }
@@ -55 +55 @@
             'width'         => 400,
             'height'        => 225,
-            'html'          => get_post_embed_html( $post, 400, 225 ),
+            'html'          => get_post_embed_html( 400, 225, $post ),
         ), $data );
     }

trunk/tests/phpunit/tests/oembed/template.php

@@ -237 +237 @@
 
     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 ) );
     }
 
@@ -246 +246 @@
         $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 ) );
     }