set fixed pcntl_alarm in daemon, pass ICONS_URL as init param

diff --git a/functions.php b/functions.php
index fb38f6b3bd3494c0221a514b644a424778067a3b..275efb1c755cf51efc52ed67e618bb06f2b72519 100644 (file)
--- 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 ca60b2a3aa4d82c3740c0b90ed0f51b85fac4039..528418fb377e01b3184ee54171699082d96f7962 100644 (file)
--- 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);