From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 13:07:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'ArthurHoaro/daily-date' into next
X-Git-Tag: v0.5.0~34
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4a5827ff5adadcd8c1ef9231e485f77c0c376c03;hp=adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'ArthurHoaro/daily-date' into next
---

diff --git a/index.php b/index.php
index d0dd5306..5aa7116f 100644
--- a/index.php
+++ b/index.php
@@ -981,7 +981,7 @@ function showDaily()
     $PAGE->assign('linksToDisplay',$linksToDisplay);
     $PAGE->assign('linkcount',count($LINKSDB));
     $PAGE->assign('cols', $columns);
-    $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000'))));
+    $PAGE->assign('day',linkdate2timestamp($day.'_000000'));
     $PAGE->assign('previousday',$previousday);
     $PAGE->assign('nextday',$nextday);
     $PAGE->renderPage('daily');
diff --git a/tpl/daily.html b/tpl/daily.html
index 919795bb..0f762490 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -13,7 +13,7 @@
 	  <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
     </div>
     <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></div>
-    <div class="dailyDate"><span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span> {$day} <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span></div>
+    <div class="dailyDate"><span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span> {function="strftime('%A %d, %B %Y', $day)"} <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span></div>
     <div class="clear"></div>
 
     {if="$linksToDisplay"}