mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-25 12:38:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor SimplePie merge (#2870)

Browse Source 
https://github.com/FreshRSS/FreshRSS/pull/2852 was merged upstream
https://github.com/simplepie/simplepie/pull/643
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2814
This commit is contained in:
Alexandre Alapetite authored and GitHub committed 2020-04-01 22:42:32 +02:00
1 parent 16528a2ce5
commit 9997acd611
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
lib/SimplePie/SimplePie.php
+2 -3
View File
@@ -1417,7 +1417,7 @@ class SimplePie
// Decide whether to enable caching
if ($this->cache && $parsed_feed_url['scheme'] !== '')
{
$url = $this->feed_url . ($this->force_feed ? '#force_feed' : ''); //FreshRSS
$url = $this->feed_url . ($this->force_feed ? '#force_feed' : '');
$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $url), 'spc'));
}
@@ -1772,8 +1772,7 @@ class SimplePie
{
trigger_error("$this->cache_location is not writable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
}
$url = $this->feed_url . ($this->force_feed ? '#force_feed' : ''); //FreshRSS
$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $url), 'spc'));
$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
}
}
$this->feed_url = $file->url;