fix globalUpdateFeeds failing when no active session exists

This commit is contained in:
Andrew Dolgov 2013-08-25 17:34:27 +04:00
parent f426c84787
commit e1f1857d95
1 changed files with 10 additions and 2 deletions

View File

@ -508,6 +508,13 @@ class RPC extends Handler_Protected {
$random_qpart = sql_random_function(); $random_qpart = sql_random_function();
// we could be invoked from public.php with no active session
if ($_SESSION["uid"]) {
$owner_check_qpart = "AND ttrss_feeds.owner_uid = '".$_SESSION["uid"]."'";
} else {
$owner_check_qpart = "";
}
// We search for feed needing update. // We search for feed needing update.
$result = $dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id $result = $dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
FROM FROM
@ -516,8 +523,9 @@ class RPC extends Handler_Protected {
ttrss_feeds.owner_uid = ttrss_users.id ttrss_feeds.owner_uid = ttrss_users.id
AND ttrss_users.id = ttrss_user_prefs.owner_uid AND ttrss_users.id = ttrss_user_prefs.owner_uid
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." $owner_check_qpart
$update_limit_qpart $updstart_thresh_qpart $update_limit_qpart
$updstart_thresh_qpart
ORDER BY $random_qpart LIMIT 30"); ORDER BY $random_qpart LIMIT 30");
$feed_id = -1; $feed_id = -1;