Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2009-10-27 16:25:00 +03:00
commit 86f84a9b26
2 changed files with 7 additions and 2 deletions

View File

@ -76,6 +76,10 @@
print_error_xml(7); exit; print_error_xml(7); exit;
} }
if (SINGLE_USER_MODE) {
authenticate_user($link, "admin", null);
}
if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds"
&& $op != "rss" && $op != "getUnread" && $op != "publish") { && $op != "rss" && $op != "getUnread" && $op != "publish") {

View File

@ -469,6 +469,7 @@ function view(id, feed_id, skip_history) {
debug("cache check result: " + (cached_article != false)); debug("cache check result: " + (cached_article != false));
enableHotkeys(); enableHotkeys();
hideAuxDlg();
//setActiveFeedId(feed_id); //setActiveFeedId(feed_id);