From ee6a1bdde381a4ac95d8c7393deda3ebbaae1ead Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 2 Dec 2013 19:53:36 +0100
Subject: PHP : Alertes fonction date()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

En attendant https://github.com/marienfressinaud/FreshRSS/issues/310 la
fonction date() générait des alertes sur les systèmes n'ayant pas
personnalisé PHP
Voir http://us3.php.net/manual/en/function.date-default-timezone-set.php
---
 app/views/index/logs.phtml | 6 +++---
 lib/lib_rss.php            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 71a55a1b7..5a0b03b98 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -12,11 +12,11 @@
 	<?php if (!empty ($items)) { ?>
 	<div class="logs">
 		<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
-		
+
 		<?php foreach ($items as $log) { ?>
-		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
+		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo @date ('Y-m-d H:i:s', strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
 		<?php } ?>
-		
+
 		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 9bce0760b..22e50a424 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -70,7 +70,7 @@ function timestamptodate ($t, $hour = true) {
 		$date = Translate::t ('format_date', $month);
 	}
 
-	return date ($date, $t);
+	return @date ($date, $t);
 }
 
 function sortEntriesByDate ($entry1, $entry2) {
-- 
cgit v1.2.3