Changeset 31066

Timestamp:

01/07/2015 07:50:58 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Don't force newlines around URLs in WP_Embed::autoembed().

props chipx86, sgrant.
fixes #23776.

Location:

trunk

Files:

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

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

@@ -312 +312 @@
          */
         public function autoembed( $content ) {
-                return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+                return preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
         }
 
@@ -324 +324 @@
                 $oldval = $this->linkifunknown;
                 $this->linkifunknown = false;
-                $return = $this->shortcode( array(), $match[1] );
+                $return = $this->shortcode( array(), $match[2] );
                 $this->linkifunknown = $oldval;
 
-                return "\n$return\n";
+                return $match[1] . $return . $match[3];
         }
 

trunk/tests/phpunit/tests/media.php

@@ -131 +131 @@
                 $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' );
                 $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out );
+        }
+
+        /**
+         * @ticket 23776
+         */
+        function test_autoembed_empty() {
+                global $wp_embed;
+
+                $content = '';
+
+                $result = $wp_embed->autoembed( $content );
+                $this->assertEquals( $content, $result );
+        }
+
+        /**
+         * @ticket 23776
+         */
+        function test_autoembed_no_paragraphs_around_urls() {
+                global $wp_embed;
+
+                $content = <<<EOF
+$ my command
+First line.
+
+http://example.com/1/
+http://example.com/2/
+Last line.
+
+<pre>http://some.link/
+http://some.other.link/</pre>
+EOF;
+
+                $result = $wp_embed->autoembed( $content );
+                $this->assertEquals( $content, $result );
         }