summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--functions.php2
-rw-r--r--update_daemon.php6
2 files changed, 3 insertions, 5 deletions
diff --git a/functions.php b/functions.php
index fb38f6b3b..275efb1c7 100644
--- a/functions.php
+++ b/functions.php
@@ -2201,6 +2201,8 @@
print "<param key=\"cdm_auto_catchup\" value=\"" .
sprintf("%d", get_pref($link, "CDM_AUTO_CATCHUP")) . "\"/>";
+ print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
+
print "</init-params>";
}
diff --git a/update_daemon.php b/update_daemon.php
index ca60b2a3a..528418fb3 100644
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -157,11 +157,7 @@
_debug("Updating...");
- if (defined('MAGPIE_FETCH_TIME_OUT')) {
- pcntl_alarm(MAGPIE_FETCH_TIME_OUT * 2);
- } else {
- pcntl_alarm(300);
- }
+ pcntl_alarm(300);
update_rss_feed($link, $line["feed_url"], $line["id"], true);