Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
This commit is contained in:
commit
86f84a9b26
|
@ -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") {
|
||||
|
||||
|
|
|
@ -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) +
|
||||
|
|
Loading…
Reference in New Issue