WordPress 3.9

[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 575066ccc053a49268691a8ff78db03aeedf9bad..66b2820f3f24a28d39b2071c6727e0e94ce8ee30 100644 (file)
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -130,7 +130,12 @@ class WP_Embed {
         * @uses get_post_meta()
         * @uses update_post_meta()
         *
-        * @param array $attr Shortcode attributes.
+        * @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 The embed HTML on success, otherwise the original URL.
         */
@@ -158,6 +163,8 @@ class WP_Embed {
                                                 *
                                                 * @since 2.9.0
                                                 *
+                                                * @see WP_Embed::shortcode()
+                                                *
                                                 * @param mixed  $return The shortcode callback function to call.
                                                 * @param string $url    The attempted embed URL.
                                                 * @param array  $attr   An array of shortcode attributes.
@@ -189,6 +196,8 @@ class WP_Embed {
                                         *
                                         * @since 2.9.0
                                         *
+                                        * @see WP_Embed::shortcode()
+                                        *
                                         * @param mixed  $cache   The cached HTML result, stored in post meta.
                                         * @param string $url     The attempted embed URL.
                                         * @param array  $attr    An array of shortcode attributes.
@@ -200,6 +209,8 @@ class WP_Embed {
                        /**
                         * Filter whether to inspect the given URL for discoverable <link> tags.
                         *
+                        * @since 2.9.0
+                        *
                         * @see WP_oEmbed::discover()
                         *
                         * @param bool false Whether to enable <link> tag discovery. Default false.