headlines cache: force refresh when subop is present

diff --git a/feedlist.js b/feedlist.js
index 872709a10f5f71f507be5f1a75bdbc669d458f55..272a6c15ef36432d31a7f037e795bad5d2b383b0 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -152,7 +152,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                var unread_ctr = document.getElementById("FEEDU-" + feed);
                var cache_check = false;
 
-               if (unread_ctr && !page_offset && !force_nocache) {
+               if (unread_ctr && !page_offset && !force_nocache && !subop) {
                        unread_ctr = unread_ctr.innerHTML;
 
                        var cache_prefix = "";

diff --git a/sanity_check.php b/sanity_check.php
index a8a91b73c4e8dac1f9f3c7ca634573a8375e1bfd..5c90eae74a7372a52ae19296c81fdf9fe1fbf35a 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 12);
-       define('SCHEMA_VERSION', 26);
+       define('SCHEMA_VERSION', 27);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 18f7e0c613fc7d16c45bdad4b166edb681d9b816..18b159ff17e2851d567b7fdb54c653d57d0936c2 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -76,6 +76,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
        include_in_digest boolean not null default true,
        cache_images boolean not null default false,
        auth_pass_encrypted boolean not null default false,
+       last_viewed datetime default null,
        index(owner_uid),
        foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
        index(cat_id),

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index dfb32ca1506bf921609c6e3d37063ce3db99f34f..bf738aa915d3d889519f9a720f1425003d360660 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -68,6 +68,7 @@ create table ttrss_feeds (id serial not null primary key,
        include_in_digest boolean not null default true,
        rtl_content boolean not null default false,
        cache_images boolean not null default false,
+       last_viewed timestamp default null,
        auth_pass_encrypted boolean not null default false);    
 
 create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);