WordPress 4.3-scripts

[autoinstalls/wordpress.git] / wp-includes / class-wp-embed.php

diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index a10024a789a74ae532401574dcd3e792ca8790c4..74051970948d3b2e790d88f7f313ed8a39808f2d 100644 (file)
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -11,6 +11,8 @@ class WP_Embed {
        public $post_ID;
        public $usecache = true;
        public $linkifunknown = true;
+       public $last_attr = array();
+       public $last_url = '';
 
        /**
         * When an URL cannot be embedded, return false instead of returning a link
@@ -42,7 +44,7 @@ class WP_Embed {
         * this function removes all existing shortcodes, registers the [embed] shortcode,
         * calls {@link do_shortcode()}, and then re-registers the old shortcodes.
         *
-        * @uses $shortcode_tags
+        * @global array $shortcode_tags
         *
         * @param string $content Content to parse
         * @return string Content with shortcode parsed
@@ -57,7 +59,7 @@ class WP_Embed {
                add_shortcode( 'embed', array( $this, 'shortcode' ) );
 
                // Do the shortcode (only the [embed] one is registered)
-               $content = do_shortcode( $content );
+               $content = do_shortcode( $content, true );
 
                // Put the original shortcodes back
                $shortcode_tags = $orig_shortcode_tags;
@@ -77,11 +79,9 @@ class WP_Embed {
 
 ?>
 <script type="text/javascript">
-/* <![CDATA[ */
        jQuery(document).ready(function($){
                $.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
        });
-/* ]]> */
 </script>
 <?php
        }
@@ -92,7 +92,7 @@ class WP_Embed {
         *
         * @param string $id An internal ID/name for the handler. Needs to be unique.
         * @param string $regex The regex that will be used to see if this handler should be used for a URL.
-        * @param callback $callback The callback function that will be called if the regex is matched.
+        * @param callable $callback The callback function that will be called if the regex is matched.
         * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
         */
        public function register_handler( $id, $regex, $callback, $priority = 10 ) {
@@ -109,8 +109,7 @@ class WP_Embed {
         * @param int $priority Optional. The priority of the handler to be removed (default: 10).
         */
        public function unregister_handler( $id, $priority = 10 ) {
-               if ( isset($this->handlers[$priority][$id]) )
-                       unset($this->handlers[$priority][$id]);
+               unset( $this->handlers[ $priority ][ $id ] );
        }
 
        /**
@@ -126,7 +125,8 @@ class WP_Embed {
         *     @type int $height Height of the embed in pixels.
         * }
         * @param string $url The URL attempting to be embedded.
-        * @return string The embed HTML on success, otherwise the original URL.
+        * @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();
@@ -135,12 +135,18 @@ class WP_Embed {
                        $url = $attr['src'];
                }
 
-               if ( empty( $url ) )
+               $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 &amp; and we need to undo this
                // See https://core.trac.wordpress.org/ticket/11311
                $url = str_replace( '&amp;', '&', $url );
@@ -312,7 +318,14 @@ class WP_Embed {
         * @return string Potentially modified $content.
         */
        public function autoembed( $content ) {
-               return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
+               // Replace line breaks from all HTML elements with placeholders.
+               $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
+
+               // Find URLs that are on their own line.
+               $content = preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+
+               // Put the line breaks back.
+               return str_replace( '<!-- wp-line-break -->', "\n", $content );
        }
 
        /**
@@ -324,10 +337,10 @@ class WP_Embed {
        public function autoembed_callback( $match ) {
                $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];
        }
 
        /**