X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..38ca813a0e312e2768e5b9519f0415cd0aa84781:/wp-includes/class-feed.php

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index 70124395..067f36c2 100644
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -4,15 +4,6 @@ if ( !class_exists('SimplePie') )
 	require_once (ABSPATH . WPINC . '/class-simplepie.php');
 
 class WP_Feed_Cache extends SimplePie_Cache {
-	/**
-	 * Don't call the constructor. Please.
-	 *
-	 * @access private
-	 */
-	function WP_Feed_Cache() {
-		trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
-	}
-
 	/**
 	 * Create a new SimplePie_Cache object
 	 *
@@ -29,10 +20,10 @@ class WP_Feed_Cache_Transient {
 	var $mod_name;
 	var $lifetime = 43200; //Default lifetime in cache of 12 hours
 
-	function WP_Feed_Cache_Transient($location, $filename, $extension) {
+	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);
+		$this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename);
 	}
 
 	function save($data) {
@@ -65,7 +56,7 @@ class WP_Feed_Cache_Transient {
 
 class WP_SimplePie_File extends SimplePie_File {
 
-	function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
+	function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
 		$this->url = $url;
 		$this->timeout = $timeout;
 		$this->redirects = $redirects;
@@ -89,9 +80,9 @@ class WP_SimplePie_File extends SimplePie_File {
 				$this->error = 'WP HTTP Error: ' . $res->get_error_message();
 				$this->success = false;
 			} else {
-				$this->headers = $res['headers'];
-				$this->body = $res['body'];
-				$this->status_code = $res['response']['code'];
+				$this->headers = wp_remote_retrieve_headers( $res );
+				$this->body = wp_remote_retrieve_body( $res );
+				$this->status_code = wp_remote_retrieve_response_code( $res );
 			}
 		} else {
 			if ( ! $this->body = file_get_contents($url) ) {
@@ -100,4 +91,4 @@ class WP_SimplePie_File extends SimplePie_File {
 			}
 		}
 	}
-}
\ No newline at end of file
+}