WordPress 4.5-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 9569f38df3b78aa08e2a2426cb492fc667bf9f50..40eecfbba3003b41a8a3b87f6643a981e15b4fef 100644 (file)
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -11,9 +11,11 @@ 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
+        * When a URL cannot be embedded, return false instead of returning a link
         * or the URL. Bypasses the 'embed_maybe_make_link' filter.
         */
        public $return_false_on_fail = false;
@@ -33,6 +35,7 @@ class WP_Embed {
 
                // After a post is saved, cache oEmbed items via AJAX
                add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
+               add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );
        }
 
        /**
@@ -42,7 +45,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 +60,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;
@@ -90,7 +93,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 ) {
@@ -107,8 +110,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 ] );
        }
 
        /**
@@ -134,13 +136,18 @@ class WP_Embed {
                        $url = $attr['src'];
                }
 
+               $this->last_url = $url;
 
-               if ( empty( $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 );
@@ -226,12 +233,13 @@ class WP_Embed {
                         * Filter whether to inspect the given URL for discoverable link tags.
                         *
                         * @since 2.9.0
+                        * @since 4.4.0 The default value changed to true.
                         *
                         * @see WP_oEmbed::discover()
                         *
-                        * @param bool $enable Whether to enable `<link>` tag discovery. Default false.
+                        * @param bool $enable Whether to enable `<link>` tag discovery. Default true.
                         */
-                       $attr['discover'] = ( apply_filters( 'embed_oembed_discover', false ) && author_can( $post_ID, 'unfiltered_html' ) );
+                       $attr['discover'] = ( apply_filters( 'embed_oembed_discover', true ) );
 
                        // Use oEmbed to get the HTML
                        $html = wp_oembed_get( $url, $attr );
@@ -265,7 +273,7 @@ class WP_Embed {
                if ( empty($post_metas) )
                        return;
 
-               foreach( $post_metas as $post_meta_key ) {
+               foreach ( $post_metas as $post_meta_key ) {
                        if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
                                delete_post_meta( $post_ID, $post_meta_key );
                }
@@ -312,7 +320,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 );
        }
 
        /**