Ticket #34462: 34462.diff

src/wp-includes/embed-functions.php

@@ -465 +465 @@
 
         $embed_url = get_post_embed_url( $post );
 
-        $output = "<script type='text/javascript'>\n";
+        $output = '<blockquote><a href="' . get_permalink( $post ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
+
+        $output .= "<script type='text/javascript'>\n";
         $output .= "<!--//--><![CDATA[//><!--\n";
         if ( SCRIPT_DEBUG ) {
                 $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
@@ -710 +712 @@
         }
 
         $allowed_html = array(
-                'iframe' => array(
+                'a'          => array(
+                                'href' => true,
+                ),
+                'blockquote' => array(),
+                'iframe'     => array(
                         'src'          => true,
                         'width'        => true,
                         'height'       => true,
@@ -724 +730 @@
         );
 
         $html = wp_kses( $result, $allowed_html );
-        preg_match( '|^.*(<iframe.*?></iframe>).*$|m', $html, $iframes );
 
-        if ( empty( $iframes ) ) {
+        preg_match( '|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content );
+        if ( empty( $content[1] ) && empty( $content[2] ) ) {
                 return false;
         }
+        $html = $content[1] . $content[2];
 
-        $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $iframes[1] );
+        $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $html );
 
         preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
 
@@ -740 +747 @@
                 $url = esc_url( "{$results[1]}#?secret=$secret" );
 
                 $html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
+                $html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
         }
 
         return $html;

src/wp-includes/js/wp-embed.js

@@ -13 +13 @@
                         return;
                 }
 
-                var iframes = document.querySelectorAll( '.wp-embedded-content[data-secret="' + data.secret + '"]' );
+                var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
+                        blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' );
 
-                for ( var i = 0; i < iframes.length; i++ ) {
+                for ( var i = 0; i < blockquotes.length; i++ ) {
+                        blockquotes[ i ].style.display = 'none';
+                }
+
+                for ( i = 0; i < iframes.length; i++ ) {
                         var source = iframes[ i ];
 
                         /* Resize the iframe on request. */