diff options
| author | Andrew Dolgov <[email protected]> | 2009-10-27 16:25:00 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-10-27 16:25:00 +0300 |
| commit | 86f84a9b26fabf4c3d3bad586bf48cf85d77bda5 (patch) | |
| tree | b8520d2e14d7e6d9cb25b653888b707c4482197f | |
| parent | 58af152b7a559d722f964738939bc0e5e8bf0667 (diff) | |
| parent | 664306d30cabfbeb070401123b8df2fa4eb05018 (diff) | |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
| -rw-r--r-- | backend.php | 6 | ||||
| -rw-r--r-- | viewfeed.js | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/backend.php b/backend.php index 925f81087..aa8edb7ba 100644 --- a/backend.php +++ b/backend.php @@ -75,7 +75,11 @@ header("Content-Type: application/xml"); print_error_xml(7); exit; } - + + if (SINGLE_USER_MODE) { + authenticate_user($link, "admin", null); + } + if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" && $op != "rss" && $op != "getUnread" && $op != "publish") { diff --git a/viewfeed.js b/viewfeed.js index 69aa21bf1..9515cca6d 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -469,7 +469,8 @@ function view(id, feed_id, skip_history) { debug("cache check result: " + (cached_article != false)); enableHotkeys(); - + hideAuxDlg(); + //setActiveFeedId(feed_id); var query = "backend.php?op=view&id=" + param_escape(id) + |