summaryrefslogtreecommitdiff
path: root/functions.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-09-13 16:08:47 +0400
committerAndrew Dolgov <[email protected]>2010-09-13 16:08:47 +0400
commit1284402268b1124d73a206861c04f89ed70ff943 (patch)
tree747ced33bb1a4dab37ceeebda7c6de52b9c9fb6b /functions.php
parent201efb3e64a9e6cef122a813b794501f9b63ebdf (diff)
parent91c5f22946ab93d1eaf1bccc2f0c5c3dece6bc43 (diff)
Merge branch 'master' into digest-experimental
Diffstat (limited to 'functions.php')
-rw-r--r--functions.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/functions.php b/functions.php
index 232ee7c1f..eb3ba98a9 100644
--- a/functions.php
+++ b/functions.php
@@ -1850,6 +1850,8 @@
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
+
+ $_SESSION["last_version_check"] = time();
initialize_user_prefs($link, $_SESSION["uid"]);
@@ -3966,7 +3968,7 @@
}
error_reporting(0);
- if (DEFAULT_UPDATE_INTERVAL == "1") {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);