From b054790200cb6108dd24b9997486cbfac5d0a39d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 3 Jul 2015 19:57:52 -0400
Subject: Merge manually pull-request #965

---
 CONTRIBUTORS.md                    | 1 +
 app/Template/board/task_footer.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 99f6414c..02eec48c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -54,6 +54,7 @@ Contributors:
 - [Norcnorc](https://github.com/norcnorc)
 - [Nramel](https://github.com/nramel)
 - [Null-Kelvin](https://github.com/Null-Kelvin)
+- [Olaf Lessenich](https://github.com/xai)
 - [Oliver Bertuch](https://github.com/poikilotherm)
 - [Olivier Maridat](https://github.com/oliviermaridat)
 - [Oren Ben-Kiki](https://github.com/orenbenkiki)
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 7593c102..e9f22b7b 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -21,7 +21,8 @@
 <div class="task-board-icons">
     <?php if (! empty($task['date_due'])): ?>
         <span class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>">
-            <i class="fa fa-calendar"></i>&nbsp;<?= dt('%b %e', $task['date_due']) ?>
+            <i class="fa fa-calendar"></i>
+            <?= (date('Y') === date('Y', $task['date_due']) ? dt('%b %e', $task['date_due']) : dt('%b %e %Y', $task['date_due'])) ?>
         </span>
     <?php endif ?>
 
-- 
cgit v1.2.3