Wordpress 3.6

[autoinstalls/wordpress.git] / wp-includes / rss.php

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index 0d94937685907c0a010989f29f1feedbbe0058e8..cd08ec99e6625df5548fec37b78d60c19162fe5b 100644 (file)
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -422,7 +422,7 @@ function fetch_rss ($url) {
        else {
                // Flow
                // 1. check cache
        else {
                // Flow
                // 1. check cache

-               // 2. if there is a hit, make sure its fresh
+               // 2. if there is a hit, make sure it's fresh

                // 3. if cached obj fails freshness check, fetch remote
                // 4. if remote fails, return stale object, or error
 
                // 3. if cached obj fails freshness check, fetch remote
                // 4. if remote fails, return stale object, or error
 


@@ -536,7 +536,7 @@ endif;
  * @return Snoopy style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
  * @return Snoopy style response
  */
 function _fetch_remote_file($url, $headers = "" ) {

-       $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+       $resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );

        if ( is_wp_error($resp) ) {
                $error = array_shift($resp->errors);
 
        if ( is_wp_error($resp) ) {
                $error = array_shift($resp->errors);