Changeset 24918 for branches/3.6/wp-includes/class-oembed.php

Timestamp:

07/31/2013 06:53:06 AM (13 years ago)

Author:

nacin

Message:

Use wp_safe_remote_request() and friends instead of reject_unsafe_urls = true.

Merges [24917] to the 3.6 branch.
fixes #24646.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/class-oembed.php (modified) (2 diffs)

branches/3.6/wp-includes/class-oembed.php

@@ -114 +114 @@
 
                 // Fetch URL content
-                if ( $html = wp_remote_retrieve_body( wp_remote_get( $url, array( 'reject_unsafe_urls' => true ) ) ) ) {
+                if ( $html = wp_remote_retrieve_body( wp_safe_remote_get( $url ) ) ) {
 
                         // <link> types that contain oEmbed provider URLs
@@ -196 +196 @@
         function _fetch_with_format( $provider_url_with_args, $format ) {
                 $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
-                $response = wp_remote_get( $provider_url_with_args, array( 'reject_unsafe_urls' => true ) );
+                $response = wp_safe_remote_get( $provider_url_with_args );
                 if ( 501 == wp_remote_retrieve_response_code( $response ) )
                         return new WP_Error( 'not-implemented' );