vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Embeds: Cache oEmbeds in an oembed_cache custom post type instead of postmeta when there is no global $post.

Browse Source 
Add processing of embeds to rich Text widget.

Props swissspidy, westonruter, ocean90, johnbillion.
See #40854, #39994, #40935.
Fixes #34115.


git-svn-id: https://develop.svn.wordpress.org/trunk@41651 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter
2017-09-30 01:14:34 +00:00
parent 743494b654
commit 6e74a9bf23
4 changed files with 230 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/external-http/oembed.php
+3 -3
View File
@@ -35,12 +35,12 @@ class Tests_External_HTTP_OEmbed extends WP_UnitTestCase {
function test_youtube_embed_url() {
global $wp_embed;
$out = $wp_embed->autoembed( 'https://www.youtube.com/embed/QcIy9NiNbmo' );
$this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out );
$this->assertContains( 'https://www.youtube.com/embed/QcIy9NiNbmo?feature=oembed', $out );
}
function test_youtube_v_url() {
global $wp_embed;
$out = $wp_embed->autoembed( 'https://www.youtube.com/v/QcIy9NiNbmo' );
$this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out );
$this->assertContains( 'https://www.youtube.com/embed/QcIy9NiNbmo?feature=oembed', $out );
}
}
}
tests/phpunit/tests/oembed/WpEmbed.php
+81 -14
View File
@@ -161,48 +161,115 @@ class Tests_WP_Embed extends WP_UnitTestCase {
$this->assertNotEmpty( get_post_meta( $post_id, $cachekey_time, true ) );
}
public function test_shortcode_should_cache_data_in_post_meta_for_known_post() {
$GLOBALS['post'] = $this->factory()->post->create_and_get();
public function test_shortcode_should_get_cached_data_from_post_meta_for_known_post() {
global $post;
$post = $this->factory()->post->create_and_get();
$url = 'https://example.com/';
$expected = '<b>Embedded content</b>';
$key_suffix = md5( $url . serialize( wp_embed_defaults( $url ) ) );
$cachekey = '_oembed_' . $key_suffix;
$cachekey_time = '_oembed_time_' . $key_suffix;
add_post_meta( $post->ID, $cachekey, $expected );
add_filter( 'pre_oembed_result', array( $this, '_pre_oembed_result_callback' ) );
$actual = $this->wp_embed->shortcode( array(), $url );
remove_filter( 'pre_oembed_result', array( $this, '_pre_oembed_result_callback' ) );
$this->assertEquals( $expected, $actual );
$actual_2 = $this->wp_embed->shortcode( array(), $url );
$this->assertEquals( $expected, get_post_meta( $GLOBALS['post']->ID, $cachekey, true ) );
$this->assertNotEmpty( get_post_meta( $GLOBALS['post']->ID, $cachekey_time, true ) );
$cached = get_post_meta( $post->ID, $cachekey, true );
// Cleanup.
unset( $post );
// Result should be cached.
$actual = $this->wp_embed->shortcode( array(), $url );
$this->assertEquals( $expected, $actual );
$this->assertEquals( $expected, $actual_2 );
$this->assertEquals( $expected, $cached );
}
public function test_shortcode_should_cache_failure_in_post_meta_for_known_post() {
$GLOBALS['post'] = $this->factory()->post->create_and_get();
public function test_shortcode_should_get_cached_failure_from_post_meta_for_known_post() {
global $post;
$post = $this->factory()->post->create_and_get();
$url = 'https://example.com/';
$expected = '<a href="' . esc_url( $url ) . '">' . esc_html( $url ) . '</a>';
$key_suffix = md5( $url . serialize( wp_embed_defaults( $url ) ) );
$cachekey = '_oembed_' . $key_suffix;
$cachekey_time = '_oembed_time_' . $key_suffix;
add_post_meta( $post->ID, $cachekey, '{{unknown}}' );
add_post_meta( $post->ID, $cachekey_time, 0 );
add_filter( 'pre_oembed_result', '__return_empty_string' );
$actual = $this->wp_embed->shortcode( array(), $url );
remove_filter( 'pre_oembed_result', '__return_empty_string' );
$this->assertEquals( $expected, $actual );
// Result should be cached.
$actual_2 = $this->wp_embed->shortcode( array(), $url );
$this->assertEquals( '{{unknown}}', get_post_meta( $GLOBALS['post']->ID, $cachekey, true ) );
$this->assertEmpty( get_post_meta( $GLOBALS['post']->ID, $cachekey_time, true ) );
$cached = get_post_meta( $post->ID, $cachekey, true );
$cached_time = get_post_meta( $post->ID, $cachekey_time, true );
// Cleanup.
unset( $post );
$this->assertEquals( $expected, $actual );
$this->assertEquals( '{{unknown}}', $cached );
$this->assertEmpty( $cached_time );
$this->assertEquals( $expected, $actual_2 );
}
/**
* @ticket 34115
*/
public function test_shortcode_should_cache_data_in_custom_post() {
$url = 'https://example.com/';
$expected = '<b>Embedded content</b>';
$key_suffix = md5( $url . serialize( wp_embed_defaults( $url ) ) );
add_filter( 'pre_oembed_result', array( $this, '_pre_oembed_result_callback' ) );
$actual = $this->wp_embed->shortcode( array(), $url );
remove_filter( 'pre_oembed_result', array( $this, '_pre_oembed_result_callback' ) );
$oembed_post_id = $this->wp_embed->find_oembed_post_id( $key_suffix );
$post_content = get_post( $oembed_post_id )->post_content;
// Result should be cached.
$actual = $this->wp_embed->shortcode( array(), $url );
$actual_2 = $this->wp_embed->shortcode( array(), $url );
wp_delete_post( $oembed_post_id );
$this->assertNotNull( $oembed_post_id );
$this->assertEquals( $expected, $post_content );
$this->assertEquals( $expected, $actual );
$this->assertEquals( $expected, $actual_2 );
}
/**
* @ticket 34115
*/
public function test_shortcode_should_cache_failure_in_custom_post() {
$url = 'https://example.com/';
$expected = '<a href="' . esc_url( $url ) . '">' . esc_html( $url ) . '</a>';
$key_suffix = md5( $url . serialize( wp_embed_defaults( $url ) ) );
add_filter( 'pre_oembed_result', '__return_empty_string' );
$actual = $this->wp_embed->shortcode( array(), $url );
remove_filter( 'pre_oembed_result', '__return_empty_string' );
$oembed_post_id = $this->wp_embed->find_oembed_post_id( $key_suffix );
$post_content = get_post( $oembed_post_id )->post_content;
// Result should be cached.
$actual_2 = $this->wp_embed->shortcode( array(), $url );
wp_delete_post( $oembed_post_id );
$this->assertEquals( $expected, $actual );
$this->assertEquals( $expected, $actual_2 );
$this->assertNotNull( $oembed_post_id );
$this->assertEquals( '{{unknown}}', $post_content );
}
public function test_shortcode_should_get_url_from_src_attribute() {