From 27456258e6da5d274ee881c95760c51506479a2b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 28 Nov 2013 10:46:11 +0100
Subject: Touch plus standard

Corrige https://github.com/marienfressinaud/FreshRSS/issues/296
---
 app/layout/layout.phtml | 2 +-
 public/index.php        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index ac0031355..c53b28841 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -32,7 +32,7 @@
 
 <?php
 	if (isset ($this->notification)) {
-		touch(DATA_PATH . '/touch.txt', time() + 1);
+		touch(DATA_PATH . '/touch.txt');
 ?>
 <div class="notification <?php echo $this->notification['type']; ?>">
 	<?php echo $this->notification['content']; ?>
diff --git a/public/index.php b/public/index.php
index 5728d981b..9d1ee711c 100755
--- a/public/index.php
+++ b/public/index.php
@@ -26,9 +26,9 @@ if (file_exists ('install.php')) {
 	session_cache_limiter('');
 	require (LIB_PATH . '/http-conditional.php');
 	$dateLastModification = max(
-		@filemtime(DATA_PATH . '/touch.txt'),
-		@filemtime(LOG_PATH . '/application.log'),
-		@filemtime(DATA_PATH . '/application.ini')
+		@filemtime(DATA_PATH . '/touch.txt') - 1,
+		@filemtime(LOG_PATH . '/application.log') - 1,
+		@filemtime(DATA_PATH . '/application.ini') - 1
 	);
 	if (httpConditional($dateLastModification, 0, 0, false, false, true)) {
 		exit();	//No need to send anything
-- 
cgit v1.2.3