diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-04-01 22:42:32 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-04-01 22:42:32 +0200 |
| commit | 9997acd6115e03ef9cd8e7b5097caaccc531cbf0 (patch) | |
| tree | 9ca52e51ff23b8862982d81e108c228c358e6d41 /lib/SimplePie | |
| parent | 16528a2ce5b008c53a2cccc3c9486fa070fa8863 (diff) | |
Minor SimplePie merge (#2870)
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
Diffstat (limited to 'lib/SimplePie')
| -rw-r--r-- | lib/SimplePie/SimplePie.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php index fe717a823..76435cd0c 100644 --- a/lib/SimplePie/SimplePie.php +++ b/lib/SimplePie/SimplePie.php @@ -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; |