Wordpress 3.3.1-scripts

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

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index a09b316768132fe8ea6f42d6cc49cdbac7955f7b..f79772caedaecdae37086c1a57f39a27357c509e 100644 (file)
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -21,29 +21,22 @@ class WP_oEmbed {
        var $providers = array();
 
        /**
-        * PHP4 constructor
-        */
-       function WP_oEmbed() {
-               return $this->__construct();
-       }
-
-       /**
-        * PHP5 constructor
+        * Constructor
         *
         * @uses apply_filters() Filters a list of pre-defined oEmbed providers.
         */
        function __construct() {
                // List out some popular sites that support oEmbed.
                // The WP_Embed class disables discovery for non-unfiltered_html users, so only providers in this array will be used for them.
-               // Add to this list using the wp_oembed_add_provider() function (see it's PHPDoc for details).
+               // Add to this list using the wp_oembed_add_provider() function (see its PHPDoc for details).
                $this->providers = apply_filters( 'oembed_providers', array(
                        '#http://(www\.)?youtube.com/watch.*#i'         => array( 'http://www.youtube.com/oembed',            true  ),
                        'http://youtu.be/*'                             => array( 'http://www.youtube.com/oembed',            false ),
-                       'http://blip.tv/file/*'                         => array( 'http://blip.tv/oembed/',                   false ),
-                       '#http://(www\.)?vimeo\.com/.*#i'               => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
+                       'http://blip.tv/*'                              => array( 'http://blip.tv/oembed/',                   false ),
+                       '#http://(www\.)?vimeo\.com/.*#i'               => array( 'http://vimeo.com/api/oembed.{format}',     true  ),
                        '#http://(www\.)?dailymotion\.com/.*#i'         => array( 'http://www.dailymotion.com/api/oembed',    true  ),
                        '#http://(www\.)?flickr\.com/.*#i'              => array( 'http://www.flickr.com/services/oembed/',   true  ),
-                       '#http://(.+)?smugmug\.com/.*#i'                => array( 'http://api.smugmug.com/services/oembed/',  true  ),
+                       '#http://(.+\.)?smugmug\.com/.*#i'              => array( 'http://api.smugmug.com/services/oembed/',  true  ),
                        '#http://(www\.)?hulu\.com/watch/.*#i'          => array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
                        '#http://(www\.)?viddler\.com/.*#i'             => array( 'http://lab.viddler.com/services/oembed/',  true  ),
                        'http://qik.com/*'                              => array( 'http://qik.com/api/oembed.{format}',       false ),
@@ -52,7 +45,7 @@ class WP_oEmbed {
                        'http://gi*.photobucket.com/groups/*'           => array( 'http://photobucket.com/oembed',            false ),
                        '#http://(www\.)?scribd\.com/.*#i'              => array( 'http://www.scribd.com/services/oembed',    true  ),
                        'http://wordpress.tv/*'                         => array( 'http://wordpress.tv/oembed/',              false ),
-                       '#http://(answers|surveys)\.polldaddy.com/.*#i' => array( 'http://polldaddy.com/oembed/',             true  ),
+                       '#http://(.+\.)?polldaddy\.com/.*#i'            => array( 'http://polldaddy.com/oembed/',             true  ),
                        '#http://(www\.)?funnyordie\.com/videos/.*#i'   => array( 'http://www.funnyordie.com/oembed',         true  ),
                ) );
 
@@ -165,8 +158,8 @@ class WP_oEmbed {
        function fetch( $provider, $url, $args = '' ) {
                $args = wp_parse_args( $args, wp_embed_defaults() );
 
-               $provider = add_query_arg( 'maxwidth', $args['width'], $provider );
-               $provider = add_query_arg( 'maxheight', $args['height'], $provider );
+               $provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
+               $provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
                $provider = add_query_arg( 'url', urlencode($url), $provider );
 
                foreach( array( 'json', 'xml' ) as $format ) {
@@ -242,7 +235,7 @@ class WP_oEmbed {
                                        return false;
 
                                $title = ( !empty($data->title) ) ? $data->title : '';
-                               $return = '<img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" />';
+                               $return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
                                break;
 
                        case 'video':