aboutsummaryrefslogtreecommitdiff
path: root/lib/lib_rss.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-28 22:29:55 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-28 22:29:55 +0100
commit2e5d4d97c989f55c3506ceb918126eaf9c68f1d6 (patch)
treedadcd6cfff639570e637b7f991c4e45ad8a1dba6 /lib/lib_rss.php
parentc6f35ef51c2c536efb4f8e73603ae46b8512cc24 (diff)
More limit options in config.php
See e.g. https://github.com/marienfressinaud/FreshRSS/issues/681 https://github.com/marienfressinaud/FreshRSS/issues/680 https://github.com/marienfressinaud/FreshRSS/issues/656
Diffstat (limited to 'lib/lib_rss.php')
-rw-r--r--lib/lib_rss.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8ae357f02..3648a4582 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -110,11 +110,12 @@ function html_only_entity_decode($text) {
}
function customSimplePie() {
+ $limits = Minz_Configuration::limits();
$simplePie = new SimplePie();
$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
$simplePie->set_cache_location(CACHE_PATH);
- $simplePie->set_cache_duration(800);
- $simplePie->set_timeout(10); //TODO: Make a user setting
+ $simplePie->set_cache_duration($limits['cache_duration']);
+ $simplePie->set_timeout($limits['timeout']);
$simplePie->strip_htmltags(array(
'base', 'blink', 'body', 'doctype', 'embed',
'font', 'form', 'frame', 'frameset', 'html',