Merge manually pull-request #965

2015-07-03 19:57:52 -04:00
parent d3f3669840
commit b054790200
2 changed files with 3 additions and 1 deletions
--- 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 ?>