e.id utilise la date déclarée pour les nouveaux flux

Contribue à https://github.com/marienfressinaud/FreshRSS/issues/202

2 files changed, 4 insertions, 1 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);
 					}
 				}
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 80e8d7b6e..f8ec1287c 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -203,7 +203,7 @@ class EntryDAO extends Model_pdo {
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
-			microtime(true),
+			$valuesTmp['id'],
 			substr($valuesTmp['guid'], 0, 760),
 			substr($valuesTmp['title'], 0, 255),
 			substr($valuesTmp['author'], 0, 255),