aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-28 10:05:58 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-28 10:05:58 +0100
commitdcd6f3ef16f7e698ef1aa8c5bdd5a1e2c85021c9 (patch)
tree7d9348a772672231bcc44180237fb2203803b25e /app/controllers/feedController.php
parentee2c1a8c7888ef16d76a0c03ff2040aaa8a11a94 (diff)
e.id utilise la date déclarée pour les nouveaux flux
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/202
Diffstat (limited to 'app/controllers/feedController.php')
-rwxr-xr-xapp/controllers/feedController.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index cd252b086..2bbd5ab49 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -97,6 +97,7 @@ class feedController extends ActionController {
if ($entry->date (true) >= $date_min ||
$feed->keepHistory ()) {
$values = $entry->toArray ();
+ $values['id'] = min(time(), $entry->date (true)) . '.' . rand(0, 999999);
$entryDAO->addEntry ($values);
}
}
@@ -196,6 +197,8 @@ class feedController extends ActionController {
($entry->date (true) >= $date_min ||
$feed->keepHistory ())) {
$values = $entry->toArray ();
+ //Use declared date at first import, otherwise use discovery date
+ $values['id'] = empty($existingGuids) ? min(time(), $entry->date (true)) . '.' . rand(0, 999999) : microtime(true);
$entryDAO->addEntry ($values);
}
}