some searchbox focus workarouns, content hash checking is optional now
This commit is contained in:
parent
da61567a39
commit
36bf74967c
|
@ -261,7 +261,9 @@
|
|||
}
|
||||
|
||||
$result = pg_query("SELECT count(id) AS total_entries
|
||||
FROM ttrss_entries WHERE feed_id = '$feed'");
|
||||
FROM ttrss_entries WHERE
|
||||
$search_query_part
|
||||
feed_id = '$feed'");
|
||||
|
||||
$total_entries = pg_fetch_result($result, 0, "total_entries");
|
||||
|
||||
|
|
|
@ -8,5 +8,6 @@
|
|||
define(ICONS_DIR, "icons");
|
||||
define(ICONS_URL, "icons");
|
||||
define(PURGE_OLD_DAYS, 30);
|
||||
define(UPDATE_POST_ON_CHECKSUM_CHANGE, true);
|
||||
?>
|
||||
|
||||
|
|
|
@ -195,8 +195,10 @@
|
|||
if ($orig_title != $entry_title) {
|
||||
$last_read_qpart = 'last_read = null,';
|
||||
}
|
||||
|
||||
if (UPDATE_POST_ON_CHECKSUM_CHANGE &&
|
||||
$orig_content_hash != $content_hash) {
|
||||
|
||||
if ($orig_content_hash != $content_hash) {
|
||||
$last_read_qpart = 'last_read = null,';
|
||||
}
|
||||
|
||||
|
|
|
@ -244,6 +244,8 @@ function catchupAllFeeds() {
|
|||
|
||||
function viewfeed(feed, skip, subop) {
|
||||
|
||||
enableHotkeys();
|
||||
|
||||
var searchbox = document.getElementById("searchbox");
|
||||
|
||||
if (searchbox) {
|
||||
|
@ -298,6 +300,8 @@ function cleanSelectedHeadlines() {
|
|||
|
||||
function view(id,feed_id) {
|
||||
|
||||
enableHotkeys();
|
||||
|
||||
if (xmlhttp_view.readyState != 4 && xmlhttp_view.readyState != 0) {
|
||||
printLockingError();
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue