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

Timestamp:

06/23/2020 06:06:11 AM (4 years ago)

Author:

whyisjake

Message:

Embeds: Ensure that classic embed support works in the block editor.

See ​https://github.com/WordPress/gutenberg/pull/6345

Fixes #45447.

Props swisspidy, pento, audrasjb, aduth, jrchamp, thrijith, TimothyBlynJacobs, whyisjake.

File:

• trunk/src/wp-includes/class-wp-embed.php (modified) (3 diffs)

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

@@ -127 +127 @@
 
     /**
-     * The do_shortcode() callback function.
-     *
-     * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of
-     * the registered embed handlers. If none of the regex matches and it's enabled, then the URL
-     * will be given to the WP_oEmbed class.
+     * Returns embed HTML for a given URL from embed handlers.
+     *
+     * Attempts to convert a URL into embed HTML by checking the URL
+     * against the regex of the registered embed handlers.
+     *
+     * @since 5.5.0
      *
      * @param array $attr {
@@ -140 +141 @@
      * }
      * @param string $url The URL attempting to be embedded.
-     * @return string|false The embed HTML on success, otherwise the original URL.
-     *                      `->maybe_make_link()` can return false on failure.
-     */
-    public function shortcode( $attr, $url = '' ) {
-        $post = get_post();
-
-        if ( empty( $url ) && ! empty( $attr['src'] ) ) {
-            $url = $attr['src'];
-        }
-
-        $this->last_url = $url;
-
-        if ( empty( $url ) ) {
-            $this->last_attr = $attr;
-            return '';
-        }
-
+     * @return string|false The embed HTML on success, false otherwise.
+     */
+    public function get_embed_handler_html( $attr, $url ) {
         $rawattr = $attr;
         $attr    = wp_parse_args( $attr, wp_embed_defaults( $url ) );
 
-        $this->last_attr = $attr;
-
-        // KSES converts & into & and we need to undo this.
-        // See https://core.trac.wordpress.org/ticket/11311
-        $url = str_replace( '&', '&', $url );
-
-        // Look for known internal handlers.
         ksort( $this->handlers );
         foreach ( $this->handlers as $priority => $handlers ) {
@@ -188 +168 @@
                 }
             }
+        }
+
+        return false;
+    }
+
+    /**
+     * The do_shortcode() callback function.
+     *
+     * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of
+     * the registered embed handlers. If none of the regex matches and it's enabled, then the URL
+     * will be given to the WP_oEmbed class.
+     *
+     * @param array $attr {
+     *     Shortcode attributes. Optional.
+     *
+     *     @type int $width  Width of the embed in pixels.
+     *     @type int $height Height of the embed in pixels.
+     * }
+     * @param string $url The URL attempting to be embedded.
+     * @return string|false The embed HTML on success, otherwise the original URL.
+     *                      `->maybe_make_link()` can return false on failure.
+     */
+    public function shortcode( $attr, $url = '' ) {
+        $post = get_post();
+
+        if ( empty( $url ) && ! empty( $attr['src'] ) ) {
+            $url = $attr['src'];
+        }
+
+        $this->last_url = $url;
+
+        if ( empty( $url ) ) {
+            $this->last_attr = $attr;
+            return '';
+        }
+
+        $rawattr = $attr;
+        $attr    = wp_parse_args( $attr, wp_embed_defaults( $url ) );
+
+        $this->last_attr = $attr;
+
+        // KSES converts & into & and we need to undo this.
+        // See https://core.trac.wordpress.org/ticket/11311
+        $url = str_replace( '&', '&', $url );
+
+        // Look for known internal handlers.
+        $embed_handler_html = $this->get_embed_handler_html( $rawattr, $url );
+        if ( false !== $embed_handler_html ) {
+            return $embed_handler_html;
         }