Wordpress 3.5.2
[autoinstalls/wordpress.git] / wp-includes / class-feed.php
index c442050c12d64c3f1dd21deb829314d824670f79..491d775e144491eaf2e7156e65fd39cc79f83643 100644 (file)
@@ -66,7 +66,11 @@ class WP_SimplePie_File extends SimplePie_File {
                $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,
+                               'reject_unsafe_urls' => true,
+                       );
 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;
@@ -85,10 +89,8 @@ class WP_SimplePie_File extends SimplePie_File {
                                $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;
                }
        }
 }