summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-28 10:46:11 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-28 10:46:11 +0100
commit27456258e6da5d274ee881c95760c51506479a2b (patch)
treeeb17c6db15548557d0f796ad6da588abde690458
parentdcd6f3ef16f7e698ef1aa8c5bdd5a1e2c85021c9 (diff)
Touch plus standard
Corrige https://github.com/marienfressinaud/FreshRSS/issues/296
-rw-r--r--app/layout/layout.phtml2
-rwxr-xr-xpublic/index.php6
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