From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 9 Feb 2011 09:41:35 +0000 (+0300)
Subject: backend/rss: fix previous patch breaking active session id (refs #318)
X-Git-Tag: 1.5.2~40
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8e57cfbeb3ccc0b0770f6baf6a967b0170733b24;p=tt-rss.git

backend/rss: fix previous patch breaking active session id (refs #318)
---

diff --git a/backend.php b/backend.php
index 4c9813cd..8381c9dc 100644
--- a/backend.php
+++ b/backend.php
@@ -464,17 +464,19 @@
 				authenticate_user($link, "admin", null);
 			}
 
-			if ($key) {
-				$_SESSION['uid'] = false; // do not fallback to active session id
+			$owner_id = false;
 
+			if ($key) {
 				$result = db_query($link, "SELECT owner_uid FROM
 					ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
 
 				if (db_num_rows($result) == 1)
-					$_SESSION["uid"] = db_fetch_result($result, 0, "owner_uid");
+					$owner_id = db_fetch_result($result, 0, "owner_uid");
 			}
 
-			if ($_SESSION["uid"]) {
+			if ($owner_id) {
+				$_SESSION['uid'] = $owner_id;
+
 				generate_syndicated_feed($link, 0, $feed, $is_cat, $limit,
 					$search, $search_mode, $match_on, $view_mode);
 			} else {