diff options
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/configureController.php | 1 | ||||
| -rwxr-xr-x | app/Controllers/feedController.php | 3 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index a263db99c..76df3580b 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -121,6 +121,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { FreshRSS_Context::$user_conf->sort_order = Minz_Request::param('sort_order', 'DESC'); FreshRSS_Context::$user_conf->mark_when = array( 'article' => Minz_Request::param('mark_open_article', false), + 'gone' => Minz_Request::param('read_upon_gone', false), 'max_n_unread' => Minz_Request::paramBoolean('enable_keep_max_n_unread') ? Minz_Request::param('keep_max_n_unread', false) : false, 'reception' => Minz_Request::param('mark_upon_reception', false), 'same_title_in_feed' => Minz_Request::paramBoolean('enable_read_when_same_title_in_feed') ? diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index dd87650bc..fe5641642 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -503,10 +503,11 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { } $feedDAO->updateLastUpdate($feed->id(), false, $mtime); + $needFeedCacheRefresh |= ($feed->keepMaxUnread() != false); + $needFeedCacheRefresh |= ($feed->markAsReadUponGone() != false); if ($needFeedCacheRefresh) { $feedDAO->updateCachedValues($feed->id()); } - $feed->keepMaxUnread(); if ($entryDAO->inTransaction()) { $entryDAO->commit(); } diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 1994a2164..8c7cf7e4a 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -126,6 +126,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { $ttl = FreshRSS_Context::$user_conf->ttl_default; } + $feed->_attributes('read_upon_gone', Minz_Request::paramTernary('read_upon_gone')); $feed->_attributes('mark_updated_article_unread', Minz_Request::paramTernary('mark_updated_article_unread')); $feed->_attributes('read_upon_reception', Minz_Request::paramTernary('read_upon_reception')); $feed->_attributes('clear_cache', Minz_Request::paramTernary('clear_cache')); |