diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-03-01 19:25:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-03-01 19:25:40 +0100 |
| commit | 5872a11eb75958f12fd37c144a26c12c693d8a4a (patch) | |
| tree | b6d3064c7669270c1f947975ba7272a8f19193aa /app/Controllers | |
| parent | 0c066cb4285feb54cd9947c01dd759afdc0f37fb (diff) | |
cleanOldEntries call autoUpdateDb (#1804)
* cleanOldEntries call autoUpdateDb
https://github.com/FreshRSS/FreshRSS/issues/1803
* Fix feedDAO autoUpdateDb
* Move cleanOldEntries to EntryDAO
Only the entry table is concerned
Diffstat (limited to 'app/Controllers')
| -rwxr-xr-x | app/Controllers/entryController.php | 3 | ||||
| -rwxr-xr-x | app/Controllers/feedController.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 9c6b248a9..28f0cb745 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -169,6 +169,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { $nb_month_old = max(FreshRSS_Context::$user_conf->old_entries, 1); $date_min = time() - (3600 * 24 * 30 * $nb_month_old); + $entryDAO = FreshRSS_Factory::createEntryDao(); $feedDAO = FreshRSS_Factory::createFeedDao(); $feeds = $feedDAO->listFeeds(); $nb_total = 0; @@ -182,7 +183,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { } if ($feed_history >= 0) { - $nb = $feedDAO->cleanOldEntries($feed->id(), $date_min, $feed_history); + $nb = $entryDAO->cleanOldEntries($feed->id(), $date_min, $feed_history); if ($nb > 0) { $nb_total += $nb; Minz_Log::debug($nb . ' old entries cleaned in feed [' . $feed->url() . ']'); diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 7f66b10db..af732951f 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -408,7 +408,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->beginTransaction(); } - $nb = $feedDAO->cleanOldEntries($feed->id(), + $nb = $entryDAO->cleanOldEntries($feed->id(), $date_min, max($feed_history, count($entries) + 10)); if ($nb > 0) { |