Wordpress 3.7

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

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index 491d775e144491eaf2e7156e65fd39cc79f83643..c33b30247e047ffb41dc8d7249ecdf2a469af699 100644 (file)
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -1,7 +1,7 @@
 <?php
 
 if ( !class_exists('SimplePie') )
-       require_once (ABSPATH . WPINC . '/class-simplepie.php');
+       require_once( ABSPATH . WPINC . '/class-simplepie.php' );
 
 class WP_Feed_Cache extends SimplePie_Cache {
        /**
@@ -23,7 +23,17 @@ class WP_Feed_Cache_Transient {
        function __construct($location, $filename, $extension) {
                $this->name = 'feed_' . $filename;
                $this->mod_name = 'feed_mod_' . $filename;
-               $this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);
+
+               $lifetime = $this->lifetime;
+               /**
+                * Filter the transient lifetime of the feed cache.
+                *
+                * @since 2.8.0
+                *
+                * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
+                * @param string $filename Unique identifier for the cache object.
+                */
+               $this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
        }
 
        function save($data) {
@@ -69,7 +79,6 @@ class WP_SimplePie_File extends SimplePie_File {
                        $args = array(
                                'timeout' => $this->timeout,
                                'redirection' => $this->redirects,
-                               'reject_unsafe_urls' => true,
                        );
 
                        if ( !empty($this->headers) )
@@ -78,7 +87,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;
 
-                       $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();