sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Props swissspidy.
Fixes #34523.

git-svn-id: https://develop.svn.wordpress.org/trunk@35472 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2015-10-31 15:50:23 +00:00
parent 29f940c5b2
commit fbd0b570fc
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/embed-functions.php
View File

@ -446,12 +446,12 @@ function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
*
* @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 ) {
@ -590,7 +590,7 @@ function get_oembed_response_data_rich( $data, $post, $width, $height ) {
$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;

2
src/wp-includes/embed-template.php
View File

@ -184,7 +184,7 @@ if ( have_posts() ) :
</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' ); ?>

4
tests/phpunit/tests/oembed/getResponseData.php
View File

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

6
tests/phpunit/tests/oembed/template.php
View File

@ -236,8 +236,8 @@ class Tests_Embed_Template extends WP_UnitTestCase {
}
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,7 +245,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$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() {