Wordpress 3.6

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

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index 491d775e144491eaf2e7156e65fd39cc79f83643..bdad84db6cba40bb4079ddd0c46c30a14c1f60de 100644 (file)
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -69,7 +69,6 @@ class WP_SimplePie_File extends SimplePie_File {
                        $args = array(
                                'timeout' => $this->timeout,
                                'redirection' => $this->redirects,
                        $args = array(
                                'timeout' => $this->timeout,
                                'redirection' => $this->redirects,

-                               'reject_unsafe_urls' => true,

                        );
 
                        if ( !empty($this->headers) )
                        );
 
                        if ( !empty($this->headers) )


@@ -78,7 +77,7 @@ class WP_SimplePie_File extends SimplePie_File {
                        if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
                                $args['user-agent'] = $this->useragent;
 
                        if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
                                $args['user-agent'] = $this->useragent;
 

-                       $res = wp_remote_request($url, $args);
+                       $res = wp_safe_remote_request($url, $args);

 
                        if ( is_wp_error($res) ) {
                                $this->error = 'WP HTTP Error: ' . $res->get_error_message();
 
                        if ( is_wp_error($res) ) {
                                $this->error = 'WP HTTP Error: ' . $res->get_error_message();