mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-27 10:43:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

SimplePie 1.5.8 manual upgrade (#4113)

Browse Source 
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/4011
Instead of https://github.com/FreshRSS/FreshRSS/pull/4102
* bea5de77af
* 5aab77e105
* 76be63e72e
This commit is contained in:
Alexandre Alapetite
2022-01-02 18:11:42 +01:00
committed by GitHub
parent 0bb3e5ef12
commit ba0e690235
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/SimplePie/SimplePie.php
View File

@@ -33,7 +33,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package SimplePie
* @version 1.5.6
* @version 1.5.8
* @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
* @author Ryan Parman
* @author Sam Sneddon
@@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie');
/**
* SimplePie Version
*/
define('SIMPLEPIE_VERSION', '1.5.6');
define('SIMPLEPIE_VERSION', '1.5.8');
/**
* SimplePie Build
@@ -1389,7 +1389,7 @@ class SimplePie
* configuration options get processed, feeds are fetched, cached, and
* parsed, and all of that other good stuff.
*
* @return positive integer with modification time if using cache, boolean true if otherwise successful, false otherwise
* @return boolean|integer positive integer with modification time if using cache, boolean true if otherwise successful, false otherwise
*/
public function init()
{
@@ -1845,7 +1845,7 @@ class SimplePie
}
/**
* Get the error message for the occured error
* Get the error message for the occurred error
*
* @return string|array Error message, or array of messages for multifeeds
*/

2
lib/SimplePie/SimplePie/Cache/Redis.php
View File

@@ -152,7 +152,7 @@ class SimplePie_Cache_Redis implements SimplePie_Cache_Base {
if ($data !== false) {
$return = $this->cache->set($this->name, $data);
if ($this->options['expire']) {
return $this->cache->expire($this->name, $this->ttl);
return $this->cache->expire($this->name, $this->options['expire']);
}
return $return;
}

1
lib/SimplePie/SimplePie/Locator.php
View File

@@ -64,6 +64,7 @@ class SimplePie_Locator
var $max_checked_feeds = 10;
var $force_fsockopen = false;
var $curl_options = array();
var $dom;
protected $registry;
public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = array())

1
lib/SimplePie/SimplePie/Sanitize.php
View File

@@ -71,6 +71,7 @@ class SimplePie_Sanitize
var $useragent = '';
var $force_fsockopen = false;
var $replace_url_attributes = null;
var $registry;
/**
* List of domains for which to force HTTPS.