Wordpress 4.6

[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 40eecfbba3003b41a8a3b87f6643a981e15b4fef..17a976f2e6f32662a19988a3a42c4819b434dbd4 100644 (file)
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -16,7 +16,12 @@ class WP_Embed {
 
        /**
         * When a 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.
+        * or the URL.
+        *
+        * Bypasses the {@see 'embed_maybe_make_link'} filter.
+        *
+        * @access public
+        * @var bool

         */
        public $return_false_on_fail = false;
 
         */
        public $return_false_on_fail = false;
 


@@ -33,7 +38,7 @@ class WP_Embed {
                // Attempts to embed all URLs in a post
                add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
 
                // Attempts to embed all URLs in a post
                add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
 

-               // After a post is saved, cache oEmbed items via AJAX
+               // 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' ) );
        }
                add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
                add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );
        }


@@ -43,7 +48,7 @@ class WP_Embed {
         *
         * Since the [embed] shortcode needs to be run earlier than other shortcodes,
         * this function removes all existing shortcodes, registers the [embed] shortcode,
         *
         * Since the [embed] shortcode needs to be run earlier than other shortcodes,
         * this function removes all existing shortcodes, registers the [embed] shortcode,

-        * calls {@link do_shortcode()}, and then re-registers the old shortcodes.
+        * calls do_shortcode(), and then re-registers the old shortcodes.

         *
         * @global array $shortcode_tags
         *
         *
         * @global array $shortcode_tags
         *


@@ -70,7 +75,7 @@ class WP_Embed {
 
        /**
         * If a post/page was saved, then output JavaScript to make
 
        /**
         * If a post/page was saved, then output JavaScript to make

-        * an AJAX request that will call WP_Embed::cache_oembed().
+        * an Ajax request that will call WP_Embed::cache_oembed().

         */
        public function maybe_run_ajax_cache() {
                $post = get_post();
         */
        public function maybe_run_ajax_cache() {
                $post = get_post();


@@ -88,7 +93,10 @@ class WP_Embed {
        }
 
        /**
        }
 
        /**

-        * Register an embed handler. Do not use this function directly, use {@link wp_embed_register_handler()} instead.
+        * Registers an embed handler.
+        *
+        * Do not use this function directly, use wp_embed_register_handler() instead.
+        *

         * This function should probably also only be used for sites that do not support oEmbed.
         *
         * @param string $id An internal ID/name for the handler. Needs to be unique.
         * This function should probably also only be used for sites that do not support oEmbed.
         *
         * @param string $id An internal ID/name for the handler. Needs to be unique.


@@ -104,7 +112,9 @@ class WP_Embed {
        }
 
        /**
        }
 
        /**

-        * Unregister a previously registered embed handler. Do not use this function directly, use {@link wp_embed_unregister_handler()} instead.
+        * Unregisters a previously-registered embed handler.
+        *
+        * Do not use this function directly, use wp_embed_unregister_handler() instead.

         *
         * @param string $id The handler ID that should be removed.
         * @param int $priority Optional. The priority of the handler to be removed (default: 10).
         *
         * @param string $id The handler ID that should be removed.
         * @param int $priority Optional. The priority of the handler to be removed (default: 10).


@@ -114,10 +124,11 @@ class WP_Embed {
        }
 
        /**
        }
 
        /**

-        * The {@link do_shortcode()} callback function.
+        * 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 {@link WP_oEmbed} class.
+        * 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.
         *
         * @param array $attr {
         *     Shortcode attributes. Optional.


@@ -159,7 +170,7 @@ class WP_Embed {
                                if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
                                        if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
                                                /**
                                if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
                                        if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
                                                /**

-                                                * Filter the returned embed handler.
+                                                * Filters the returned embed handler.

                                                 *
                                                 * @since 2.9.0
                                                 *
                                                 *
                                                 * @since 2.9.0
                                                 *


@@ -187,7 +198,7 @@ class WP_Embed {
                        $cachekey_time = '_oembed_time_' . $key_suffix;
 
                        /**
                        $cachekey_time = '_oembed_time_' . $key_suffix;
 
                        /**

-                        * Filter the oEmbed TTL value (time to live).
+                        * Filters the oEmbed TTL value (time to live).

                         *
                         * @since 4.0.0
                         *
                         *
                         * @since 4.0.0
                         *


@@ -214,7 +225,7 @@ class WP_Embed {
 
                                if ( ! empty( $cache ) ) {
                                        /**
 
                                if ( ! empty( $cache ) ) {
                                        /**

-                                        * Filter the cached oEmbed HTML.
+                                        * Filters the cached oEmbed HTML.

                                         *
                                         * @since 2.9.0
                                         *
                                         *
                                         * @since 2.9.0
                                         *


@@ -230,7 +241,7 @@ class WP_Embed {
                        }
 
                        /**
                        }
 
                        /**

-                        * Filter whether to inspect the given URL for discoverable link tags.
+                        * Filters whether to inspect the given URL for discoverable link tags.

                         *
                         * @since 2.9.0
                         * @since 4.4.0 The default value changed to true.
                         *
                         * @since 2.9.0
                         * @since 4.4.0 The default value changed to true.


@@ -289,7 +300,7 @@ class WP_Embed {
 
                $post_types = get_post_types( array( 'show_ui' => true ) );
                /**
 
                $post_types = get_post_types( array( 'show_ui' => true ) );
                /**

-                * Filter the array of post types to cache oEmbed results for.
+                * Filters the array of post types to cache oEmbed results for.

                 *
                 * @since 2.9.0
                 *
                 *
                 * @since 2.9.0
                 *


@@ -312,9 +323,9 @@ class WP_Embed {
        }
 
        /**
        }
 
        /**

-        * Passes any unlinked URLs that are on their own line to {@link WP_Embed::shortcode()} for potential embedding.
+        * Passes any unlinked URLs that are on their own line to WP_Embed::shortcode() for potential embedding.

         *
         *

-        * @uses WP_Embed::autoembed_callback()
+        * @see WP_Embed::autoembed_callback()

         *
         * @param string $content The content to be searched.
         * @return string Potentially modified $content.
         *
         * @param string $content The content to be searched.
         * @return string Potentially modified $content.


@@ -323,15 +334,19 @@ class WP_Embed {
                // Replace line breaks from all HTML elements with placeholders.
                $content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
 
                // 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 );
+               if ( preg_match( '#(^|\s|>)https?://#i', $content ) ) {
+                       // Find URLs on their own line.
+                       $content = preg_replace_callback( '|^(\s*)(https?://[^\s<>"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+                       // Find URLs in their own paragraph.
+                       $content = preg_replace_callback( '|(<p(?: [^>]*)?>\s*)(https?://[^\s<>"]+)(\s*<\/p>)|i', array( $this, 'autoembed_callback' ), $content );
+               }

 
                // Put the line breaks back.
                return str_replace( '<!-- wp-line-break -->', "\n", $content );
        }
 
        /**
 
                // Put the line breaks back.
                return str_replace( '<!-- wp-line-break -->', "\n", $content );
        }
 
        /**

-        * Callback function for {@link WP_Embed::autoembed()}.
+        * Callback function for WP_Embed::autoembed().

         *
         * @param array $match A regex match array.
         * @return string The embed HTML on success, otherwise the original URL.
         *
         * @param array $match A regex match array.
         * @return string The embed HTML on success, otherwise the original URL.


@@ -359,7 +374,7 @@ class WP_Embed {
                $output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;
 
                /**
                $output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;
 
                /**

-                * Filter the returned, maybe-linked embed URL.
+                * Filters the returned, maybe-linked embed URL.

                 *
                 * @since 2.9.0
                 *
                 *
                 * @since 2.9.0
                 *