From 1555a6e4047e93d46dc764ec26fcb9dfd28e21e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@laposte.net>
Date: Mon, 18 Mar 2013 13:20:26 +0100
Subject: [PATCH] Fixes: #2130 expiration date doesn't appear

---
 alias/admin/alias/alias-list.xml            | 4 ++--
 alias/admin/alias/class_aliasManagement.inc | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/alias/admin/alias/alias-list.xml b/alias/admin/alias/alias-list.xml
index 97fd7fa953..207b850f60 100644
--- a/alias/admin/alias/alias-list.xml
+++ b/alias/admin/alias/alias-list.xml
@@ -38,7 +38,7 @@
   </definition>
 
   <table>
-    <layout>|20px;c||||100px;r|</layout>
+    <layout>|20px;c|||110px;c|100px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -70,7 +70,7 @@
     </column>
 
     <column>
-      <label>aliasExpirationDate</label>
+      <label>Expiration date</label>
       <sortAttribute>aliasExpirationDate</sortAttribute>
       <sortType>integer</sortType>
       <value>%{filter:filterDate(aliasExpirationDate)}</value>
diff --git a/alias/admin/alias/class_aliasManagement.inc b/alias/admin/alias/class_aliasManagement.inc
index f52cade170..d9735ce553 100644
--- a/alias/admin/alias/class_aliasManagement.inc
+++ b/alias/admin/alias/class_aliasManagement.inc
@@ -158,16 +158,17 @@ class aliasManagement extends management
   static function filterDate()
   {
     if (func_num_args() == 0) {
-      return;
+      return '&nbsp;';
     }
     $date = func_get_arg(0);
     if (!is_array($date)) {
-      return;
+      return '&nbsp;';
     }
     $dateObject = DateTime::createFromFormat('U', $date[0], new DateTimeZone('UTC'));
     if (is_object($dateObject)) {
       return $dateObject->format('d.m.Y');
     }
+    return '&nbsp;';
   }
 }
 ?>
-- 
GitLab