Changeset 33470

Timestamp:

07/29/2015 12:01:22 AM (9 years ago)

Author:

azaozz

Message:

Use the embed_maybe_make_link filter to test WP_Embed::autoembed().
See #33106.

Location:

trunk

Files:

• src/wp-includes/class-wp-embed.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (5 diffs)

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

@@ -130 +130 @@
      */
     public function shortcode( $attr, $url = '' ) {
-        // This filter can be used to output custom HTML instead of allowing oEmbed to run.
-        $custom = apply_filters( 'wp_embed_shortcode_custom', false, $attr, $url );
-        if ( false !== $custom ) {
-            return $custom;
-        }
-        
         $post = get_post();
 

trunk/tests/phpunit/tests/media.php

@@ -656 +656 @@
      * @ticket 33016
      */
-    function filter_wp_embed_shortcode_custom( $custom, $attr, $url ) {
+    function filter_wp_embed_shortcode_custom( $content, $url ) {
         if ( 'https://www.example.com/?video=1' == $url ) {
-            $custom = "<iframe src='$url'></iframe>";
+            $content = '@embed URL was replaced@';
         }
-        return $custom;
+        return $content;
     }
 
@@ -668 +668 @@
     function test_oembed_explicit_media_link() {
         global $wp_embed;
-        add_filter( 'wp_embed_shortcode_custom', array( $this, 'filter_wp_embed_shortcode_custom' ), 10, 3 );
+        add_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10, 2 );
 
         $content = <<<EOF
@@ -675 +675 @@
 
         $expected = <<<EOF
-<iframe src='https://www.example.com/?video=1'></iframe>
+@embed URL was replaced@
 EOF;
 
@@ -687 +687 @@
 myvar = 'Hello world
 https://www.example.com/?video=1
-don't break this';
+do not break this';
 // ]]>
 </script>
@@ -695 +695 @@
         $this->assertEquals( $content, $result );
 
-        remove_filter( 'wp_embed_shortcode_custom', array( $this, 'filter_wp_embed_shortcode_custom' ), 10 );
+        remove_filter( 'embed_maybe_make_link', array( $this, 'filter_wp_embed_shortcode_custom' ), 10 );
     }
 }