Bugfix

diff --git a/lib/functions.php b/lib/functions.php
index e3264d03dc23ddf3a809511ad556e92ccd7f6f9b..0c24e16f561a85e348cc26ae6ea25fe67316739c 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -99,9 +99,11 @@ function viewData($data, $edit=null){
     }
     if(!empty($data->date)){
       if(!empty($data->time)){
-        $date=$data->date." ".$data->time;
+        $date=date("M d, Y h:i a", strtotime($data->date." ".$data->time));
+      }
+      else{
+        $date=$data->date;
       }
-      $date=$data->date;
     }
     else{
       $date="";