From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 Mar 2007 14:05:00 +0000 (+0100)
Subject: set fixed pcntl_alarm in daemon, pass ICONS_URL as init param
X-Git-Tag: 1.2.9~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8e9c121b8a3fb34302d716478a14e53e94f37b37;p=tt-rss.git

set fixed pcntl_alarm in daemon, pass ICONS_URL as init param
---

diff --git a/functions.php b/functions.php
index fb38f6b3..275efb1c 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 ca60b2a3..528418fb 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);