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 c442050c12d64c3f1dd21deb829314d824670f79..bdad84db6cba40bb4079ddd0c46c30a14c1f60de 100644 (file)
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -66,7 +66,10 @@ class WP_SimplePie_File extends SimplePie_File {
                $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
                if ( preg_match('/^http(s)?:\/\//i', $url) ) {
                $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
                if ( preg_match('/^http(s)?:\/\//i', $url) ) {

-                       $args = array( 'timeout' => $this->timeout, 'redirection' => $this->redirects);
+                       $args = array(
+                               'timeout' => $this->timeout,
+                               'redirection' => $this->redirects,
+                       );

 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;
 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;


@@ -74,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();


@@ -85,10 +88,8 @@ class WP_SimplePie_File extends SimplePie_File {
                                $this->status_code = wp_remote_retrieve_response_code( $res );
                        }
                } else {
                                $this->status_code = wp_remote_retrieve_response_code( $res );
                        }
                } else {

-                       if ( ! file_exists($url) || ( ! $this->body = file_get_contents($url) ) ) {
-                               $this->error = 'file_get_contents could not read the file';
-                               $this->success = false;
-                       }
+                       $this->error = '';
+                       $this->success = false;

                }
        }
 }
                }
        }
 }