Changeset 35437 for trunk/src/wp-includes/embed-functions.php

Timestamp:

10/29/2015 11:10:46 PM (10 years ago)

Author:

pento

Message:

Embeds: Provide a cached text fallback.

Sometimes, embedded sites might suffer from less than 100% uptime. Instead of leaving the embedding site with a big blank space where the embed should be, let's fall back to a link to the embedded post, so there's at least some context for the post.

Fixes #34462.

File:

• trunk/src/wp-includes/embed-functions.php (modified) (5 diffs)

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

@@ -462 +462 @@
     $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 ) {
@@ -753 +755 @@
 
     $allowed_html = array(
-        'iframe' => array(
+        'a'          => array(
+                    'href' => true,
+        ),
+        'blockquote' => array(),
+        'iframe'     => array(
             'src'          => true,
             'width'        => true,
@@ -767 +773 @@
 
     $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 );
+    // We require at least the iframe to exist.
+    if ( empty( $content[2] ) ) {
         return false;
     }
-
-    $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $iframes[1] );
+    $html = $content[1] . $content[2];
+
+    if ( ! empty( $content[1] ) ) {
+        // We have a blockquote to fall back on. Hide the iframe by default.
+        $html = str_replace( '<iframe', '<iframe style="display:none;"', $html );
+    }
+
+    $html = str_replace( '<iframe', '<iframe sandbox="allow-scripts" security="restricted"', $html );
 
     preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
@@ -783 +796 @@
 
         $html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
+        $html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
     }
 
@@ -911 +925 @@
     <?php
 }
+
+/**
+ * Prepare the oembed HTML to be displayed in an RSS feed.
+ *
+ * @since 4.4.0
+ * @access private
+ *
+ * @param string $content The content to filter.
+ * @return string The filtered content.
+ */
+function _oembed_filter_feed_content( $content ) {
+    return str_replace( '<iframe sandbox="allow-scripts" security="restricted" style="display:none;"', '<iframe sandbox="allow-scripts" security="restricted"', $content );
+}