Petites corrections et sortie 0.7-beta3

2 files changed, 8 insertions, 8 deletions

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index ca230232f..a3371a43e 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -198,12 +198,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				//For this feed, check last n entry GUIDs already in database
 				$existingGuids = array_fill_keys ($entryDAO->listLastGuidsByFeed ($feed->id (), count($entries) + 10), 1);
 
+				$feedHistory = $feed->keepHistory();
+				if ($feedHistory == -2) {	//default
+					$feedHistory = $this->view->conf->keepHistoryDefault();
+				}
+
 				// On ne vérifie pas strictement que l'article n'est pas déjà en BDD
 				// La BDD refusera l'ajout car (id_feed, guid) doit être unique
 				$feedDAO->beginTransaction ();
 				foreach ($entries as $entry) {
 					if ((!isset ($existingGuids[$entry->guid ()])) &&
-						($entry->date (true) >= $date_min)) {
+						(($feedHistory != 0) || ($entry->date (true) >= $date_min))) {
 						$values = $entry->toArray ();
 						//Use declared date at first import, otherwise use discovery date
 						$values['id'] = empty($existingGuids) ? min(time(), $entry->date (true)) . uSecString() : uTimeString();
@@ -212,11 +217,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					}
 				}
 
-				$feedHistory = $feed->keepHistory();
-				if ($feedHistory == -2) {	//default
-					$feedHistory = $this->view->conf->keepHistoryDefault();
-				}
-
 				if (($feedHistory >= 0) && (rand(0, 30) === 1)) {
 					$nb = $feedDAO->cleanOldEntries ($feed->id (), $date_min, max($feedHistory, count($entries) + 10));
 					if ($nb > 0) {
diff --git a/p/i/install.php b/p/i/install.php
index 0e8a972c6..132cd5508 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -573,7 +573,7 @@ function checkStep2 () {
 	if ($defaultUser === null) {
 		$defaultUser = empty($_SESSION['default_user']) ? '' : $_SESSION['default_user'];
 	}
-	$data = file_exists (DATA_PATH . '/' . $defaultUser . '_user.php');
+	$data = is_writable(DATA_PATH . '/' . $defaultUser . '_user.php');
 	if ($data) {
 		@unlink(DATA_PATH . '/Configuration.array.php');	//v0.6
 	}
@@ -585,7 +585,7 @@ function checkStep2 () {
 	);
 }
 function checkStep3 () {
-	$conf = file_exists (DATA_PATH . '/config.php');
+	$conf = is_writable(DATA_PATH . '/config.php');
 
 	$bd = isset ($_SESSION['bd_type']) &&
 	      isset ($_SESSION['bd_host']) &&