backend/rss: always use secret key to get uid when it is available instead of default...

diff --git a/backend.php b/backend.php
index 410f89864350e80b3d3d4c9faf0ed91c3069ce00..962453c4be9bb5a0684ea627554b79f8de6d81ef 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -474,7 +474,7 @@
                                authenticate_user($link, "admin", null);
                        }
 
-                       if ($key && !$_SESSION["uid"]) {
+                       if ($key) {
                                $result = db_query($link, "SELECT owner_uid FROM
                                        ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
 

diff --git a/functions.php b/functions.php
index 84738ddb8db2cc8e065cee66185f4ddae84e65c0..3928b2a348d87179469ae7e31bbbfc605562f48c 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -4093,7 +4093,7 @@
                                "</option>";
 
                        $rss_link = htmlspecialchars(get_self_url_prefix() . 
-                               "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
+                               "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view_mode=$view_mode$search_q");
 
                        print "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";