valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into digest-experimental

This commit is contained in:
Andrew Dolgov 2010-09-13 16:08:47 +04:00
parent 201efb3e64 91c5f22946
commit 1284402268
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.php
View File

@ -1850,6 +1850,8 @@
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash"); $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["last_version_check"] = time();
initialize_user_prefs($link, $_SESSION["uid"]); initialize_user_prefs($link, $_SESSION["uid"]);
@ -3966,7 +3968,7 @@
} }
error_reporting(0); error_reporting(0);
if (DEFAULT_UPDATE_INTERVAL == "1") { if (DEFAULT_UPDATE_METHOD == "1") {
$rss = new SimplePie(); $rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT); $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT); // $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);