WordPress 4.4

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

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index c442050c12d64c3f1dd21deb829314d824670f79..919440f18e87a93add1b745f53c319e85c2aaa0d 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');
+if ( ! class_exists( 'SimplePie', false ) )
+       require_once( ABSPATH . WPINC . '/class-simplepie.php' );
 
 class WP_Feed_Cache extends SimplePie_Cache {
        /**
@@ -10,44 +10,70 @@ class WP_Feed_Cache extends SimplePie_Cache {
         * @static
         * @access public
         */
-       function create($location, $filename, $extension) {
+       public function create($location, $filename, $extension) {
                return new WP_Feed_Cache_Transient($location, $filename, $extension);
        }
 }
 
 class WP_Feed_Cache_Transient {
-       var $name;
-       var $mod_name;
-       var $lifetime = 43200; //Default lifetime in cache of 12 hours
+       public $name;
+       public $mod_name;
+       public $lifetime = 43200; //Default lifetime in cache of 12 hours
 
-       function __construct($location, $filename, $extension) {
+       public 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) {
-               if ( is_a($data, 'SimplePie') )
+       /**
+        * @access public
+        */
+       public function save($data) {
+               if ( $data instanceof SimplePie ) {
                        $data = $data->data;
+               }
 
                set_transient($this->name, $data, $this->lifetime);
                set_transient($this->mod_name, time(), $this->lifetime);
                return true;
        }
 
-       function load() {
+       /**
+        * @access public
+        */
+       public function load() {
                return get_transient($this->name);
        }
 
-       function mtime() {
+       /**
+        * @access public
+        */
+       public function mtime() {
                return get_transient($this->mod_name);
        }
 
-       function touch() {
+       /**
+        * @access public
+        */
+       public function touch() {
                return set_transient($this->mod_name, time(), $this->lifetime);
        }
 
-       function unlink() {
+       /**
+        * @access public
+        */
+       public function unlink() {
                delete_transient($this->name);
                delete_transient($this->mod_name);
                return true;
@@ -56,7 +82,7 @@ class WP_Feed_Cache_Transient {
 
 class WP_SimplePie_File extends SimplePie_File {
 
-       function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
+       public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
                $this->url = $url;
                $this->timeout = $timeout;
                $this->redirects = $redirects;
@@ -66,7 +92,10 @@ 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,
+                       );
 
                        if ( !empty($this->headers) )
                                $args['headers'] = $this->headers;
@@ -74,7 +103,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();
@@ -85,10 +114,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;
                }
        }
 }