Changeset 37627

Timestamp:

06/02/2016 09:23:43 PM (9 years ago)

Author:

azaozz

Message:

Auto-embedding:

• We already match URLs on their own line, add another regex to match URLs in their own paragraphs.
• Always exclude the \s<>" characters when matching.
• Add more unit tests.

Props iseulde, azaozz.
Fixes #25387.

Location:

trunk

Files:

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

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

@@ -335 +335 @@
         $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
 
-        // Find URLs that are on their own line.
-        $content = preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+        if ( preg_match( '#(^|\s|>)https?://#i', $content ) ) {
+            // Find URLs on their own line.
+            $content = preg_replace_callback( '|^(\s*)(https?://[^\s<>"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+            // Find URLs in their own paragraph.
+            $content = preg_replace_callback( '|(<p(?: [^>]*)?>\s*)(https?://[^\s<>"]+)(\s*<\/p>)|i', array( $this, 'autoembed_callback' ), $content );
+        }
 
         // Put the line breaks back.

trunk/tests/phpunit/tests/media.php

@@ -157 +157 @@
         $result = $wp_embed->autoembed( $content );
         $this->assertEquals( $content, $result );
+    }
+
+    function data_autoembed() {
+        return array(
+
+            // Should embed
+            array(
+'https://w.org',
+'[embed]'
+            ),
+            array(
+'test
+ https://w.org
+test',
+'test
+ [embed]
+test'
+            ),
+            array(
+'<p class="test">https://w.org</p>',
+'<p class="test">[embed]</p>'
+            ),
+            array(
+'<p> https://w.org </p>',
+'<p> [embed] </p>'
+            ),
+            array(
+'<p>test
+https://w.org
+test</p>',
+'<p>test
+[embed]
+test</p>'
+            ),
+            array(
+'<p>https://w.org
+</p>',
+'<p>[embed]
+</p>'
+            ),
+
+            // Should NOT embed
+            array(
+'test https://w.org</p>'
+            ),
+            array(
+'<span>https://w.org</a>'
+            ),
+            array(
+'<pre>https://w.org
+</p>'
+            ),
+            array(
+'<a href="https://w.org">
+https://w.org</a>'
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider data_autoembed
+     */
+    function test_autoembed( $content, $result = null ) {
+        $wp_embed = new Test_Autoembed;
+
+        $this->assertEquals( $wp_embed->autoembed( $content ), $result ? $result : $content );
     }
 
@@ -1613 +1679 @@
     }
 }
+
+/**
+ * Helper class for `test_autoembed`.
+ */
+class Test_Autoembed extends WP_Embed {
+    public function shortcode( $attr, $url = '' ) {
+        return '[embed]';
+    }
+}