diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-07 11:19:34 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-05-07 11:19:34 +0200 |
| commit | 2c0f5ff19452d33cb033c2052619ef8f0cc79c97 (patch) | |
| tree | 941b7bcef7afeefae2991364b26ae4909c091a6f /app/Controllers/feedController.php | |
| parent | 53f00571e554f6eeea4fea19d9ddc5eca2ce2997 (diff) | |
| parent | 0bc59ba140b19d8e0a1762e5ffed66b0c61bd322 (diff) | |
Merge pull request #1517 from gsongsong/cli-act-num-articles
actualizeFeed return number of new articles as 3rd
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index d1f0d3535..8e0e5dd6d 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -254,6 +254,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $pshbMinAge = time() - (3600 * 24); //TODO: Make a configuration. $updated_feeds = 0; + $nb_new_articles = 0; $is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0; foreach ($feeds as $feed) { $url = $feed->url(); //For detection of HTTP 301 @@ -374,6 +375,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->beginTransaction(); } $entryDAO->addEntry($entry->toArray()); + $nb_new_articles++; } } $entryDAO->updateLastSeen($feed->id(), $oldGuids, $mtime); @@ -450,7 +452,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commit(); } } - return array($updated_feeds, reset($feeds)); + return array($updated_feeds, reset($feeds), $nb_new_articles); } /** @@ -480,7 +482,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $feedDAO->updateCachedValues(); $entryDAO->commit(); } else { - list($updated_feeds, $feed) = self::actualizeFeed($id, $url, $force, null, false, $noCommit); + list($updated_feeds, $feed, $nb_new_articles) = self::actualizeFeed($id, $url, $force, null, false, $noCommit); } if (Minz_Request::param('ajax')) { |