Ticket #17764: 17764.diff

wp-includes/media.php

@@ -1261 +1261 @@
          * @return string Potentially modified $content.
          */
         function autoembed( $content ) {
-                return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array(&$this, 'autoembed_callback'), $content );
+                return preg_replace_callback(
+                        '|^\s*(?:<a href="[^"]+">)?(?P<url>https?://[^\s<"]+)(?:</a>)?\s*$|im',
+                        array( &$this, 'autoembed_callback' ),
+                        $content
+                );
         }
 
         /**
@@ -1275 +1279 @@
         function autoembed_callback( $match ) {
                 $oldval = $this->linkifunknown;
                 $this->linkifunknown = false;
-                $return = $this->shortcode( array(), $match[1] );
+                $return = $this->shortcode( array(), $match['url'] );
                 $this->linkifunknown = $oldval;
 
                 return "\n$return\n";