From 56b269cef6bc54fa8d8fc69ff0f0e8b2ffb36afb Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 2 Dec 2013 20:12:55 +0100
Subject: PHP : suppression autres alertes

Voir https://github.com/marienfressinaud/FreshRSS/issues/310
---
 app/layout/nav_menu.phtml | 2 +-
 app/models/Entry.php      | 2 +-
 app/models/Feed.php       | 2 +-
 lib/http-conditional.php  | 4 ++--
 public/install.php        | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 4b4945108..c71497ced 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -70,7 +70,7 @@
 				<li class="item"><a href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li> 
 				<li class="separator"></li>
 <?php
-	$today = strtotime('today');
+	$today = @strtotime('today');
 	$one_week = $today - 604800;
 ?>
 				<li class="item"><a href="<?php echo _url ('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $today . '000000'); ?>"><?php echo Translate::t ('before_one_day'); ?></a></li>
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 196823f67..899e98b00 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -137,7 +137,7 @@ class Entry extends Model {
 
 	public function isDay ($day) {
 		$date = $this->dateAdded(true);
-		$today = strtotime('today');
+		$today = @strtotime('today');
 		$yesterday = $today - 86400;
 
 		if ($day === Days::TODAY &&
diff --git a/app/models/Feed.php b/app/models/Feed.php
index c1d0379a9..555759c9a 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -265,7 +265,7 @@ class Feed extends Model {
 			$title = html_only_entity_decode (strip_tags ($item->get_title ()));
 			$author = $item->get_author ();
 			$link = $item->get_permalink ();
-			$date = strtotime ($item->get_date ());
+			$date = @strtotime ($item->get_date ());
 
 			// gestion des tags (catégorie == tag)
 			$tags_tmp = $item->get_categories ();
diff --git a/lib/http-conditional.php b/lib/http-conditional.php
index 6684fd6ac..59fbef41f 100644
--- a/lib/http-conditional.php
+++ b/lib/http-conditional.php
@@ -35,7 +35,7 @@
   ... //Rest of the script, just as you would do normally.
  ?>
 
- Version 1.7 beta, 2013-11-03, http://alexandre.alapetite.fr/doc-alex/php-http-304/
+ Version 1.7 beta, 2013-12-02, http://alexandre.alapetite.fr/doc-alex/php-http-304/
 
  ------------------------------------------------------------------
  Written by Alexandre Alapetite, http://alexandre.alapetite.fr/cv/
@@ -124,7 +124,7 @@ function httpConditional($UnixTimeStamp,$cacheSeconds=0,$cachePrivacy=0,$feedMod
 	if ($feedMode)
 	{//Special RSS/ATOM
 		global $clientCacheDate;
-		$clientCacheDate=strtotime($dateCacheClient);
+		$clientCacheDate=@strtotime($dateCacheClient);
 		$cachePrivacy=0;
 	}
 
diff --git a/public/install.php b/public/install.php
index 577714764..6765d8cd1 100644
--- a/public/install.php
+++ b/public/install.php
@@ -228,6 +228,7 @@ function saveStep3 () {
 			$_SESSION['bd_error'] = true;
 		}
 	}
+	invalidateHttpCache();
 }
 function deleteInstall () {
 	$res = unlink (PUBLIC_PATH . '/install.php');
-- 
cgit v1.2.3