Changes in trunk/wp-includes/class-feed.php [11787:17928]

File:

• trunk/wp-includes/class-feed.php (modified) (4 diffs)

trunk/wp-includes/class-feed.php

@@ -5 +5 @@
 
 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
@@ -30 +21 @@
     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;
@@ -66 +57 @@
 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;
@@ -90 +81 @@
                 $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 {