Changeset 37627 for trunk/src/wp-includes/class-wp-embed.php

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.

File:

• trunk/src/wp-includes/class-wp-embed.php (modified) (1 diff)

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.