diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-10-28 09:49:10 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-10-28 09:49:10 +0100 |
| commit | e04804d0f67dd43fd3f072b9a127768ee7b7b56c (patch) | |
| tree | a49023ed25aab7fb1c1aafe749f7d462de0027b2 /app/Controllers/entryController.php | |
| parent | 44bd07e506ade204151c276fdc05994d51efdd7a (diff) | |
| parent | 4234dfe0d72b61fe931d2c76a1d8a335ce65a209 (diff) | |
Merge pull request #2049 from FreshRSS/dev1.12.0
FreshRSS 1.12.0
Diffstat (limited to 'app/Controllers/entryController.php')
| -rwxr-xr-x | app/Controllers/entryController.php | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 16a15c447..fc0af0639 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -53,6 +53,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { } $params = array(); + $this->view->tags = array(); $entryDAO = FreshRSS_Factory::createEntryDao(); if ($id === false) { @@ -81,6 +82,12 @@ class FreshRSS_entry_Controller extends Minz_ActionController { case 'a': $entryDAO->markReadEntries($id_max, false, 0, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); break; + case 't': + $entryDAO->markReadTag($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); + break; + case 'T': + $entryDAO->markReadTag('', $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read); + break; } if ($next_get !== 'a') { @@ -91,6 +98,13 @@ class FreshRSS_entry_Controller extends Minz_ActionController { } } else { $entryDAO->markRead($id, $is_read); + + $tagDAO = FreshRSS_Factory::createTagDao(); + foreach ($tagDAO->getTagsForEntry($id) as $tag) { + if (!empty($tag['checked'])) { + $this->view->tags[] = $tag['id']; + } + } } if (!$this->ajax) { @@ -193,6 +207,9 @@ class FreshRSS_entry_Controller extends Minz_ActionController { $feedDAO->updateCachedValues(); + $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); + $databaseDAO->minorDbMaintenance(); + invalidateHttpCache(); Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array( 'c' => 'configure', |