From ec583d178ab32d142cf28c2db7ab2ecd456976e8 Mon Sep 17 00:00:00 2001
From: Ralf Lang <ralf.lang@ralf-lang.de>
Date: Thu, 17 Sep 2026 08:25:24 +0200
Subject: [PATCH] fix: horde/whups#21 Wrong date/time format in ticket history

---
 lib/Application.php           | 6 ++++--
 lib/Form/Renderer/Comment.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Application.php b/lib/Application.php
index 79823ea..a90a712 100644
--- a/lib/Application.php
+++ b/lib/Application.php
@@ -517,8 +517,10 @@ protected function _downloadTicket(Variables|Horde_Variables $vars)
                     );
                 $time = DateFormat::formatDate(
                     $transaction['timestamp'],
-                    $prefs->getValue('date_format') . ' '
-                        . $prefs->getValue('time_format')
+                    $prefs->getValue('date_format')
+                ) . ' ' . DateFormat::formatDate(
+                    $transaction['timestamp'],
+                    $prefs->getValue('time_format')
                 );
                 echo <<<COMMENT
                     <table width="100%">
diff --git a/lib/Form/Renderer/Comment.php b/lib/Form/Renderer/Comment.php
index 0ccfb42..364f952 100644
--- a/lib/Form/Renderer/Comment.php
+++ b/lib/Form/Renderer/Comment.php
@@ -258,7 +258,7 @@ public function render($transaction, $vars)
 <div id="t<?php echo (int) $transaction ?>">
 <table cellspacing="0" width="100%">
  <tr>
-  <td width="20%" class="<?php echo $class ?>_l nowrap" valign="top"><?php echo DateFormat::formatDate($vars->get('timestamp'), $prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format')) ?></td>
+  <td width="20%" class="<?php echo $class ?>_l nowrap" valign="top"><?php echo DateFormat::formatDate($vars->get('timestamp'), $prefs->getValue('date_format')) . ' ' . DateFormat::formatDate($vars->get('timestamp'), $prefs->getValue('time_format')) ?></td>
   <td width="20%" class="<?php echo $class ?>_m" valign="top"><?php echo $vars->get('user_id') ? Whups::formatUser($vars->get('user_id'), false, true, true) : '&nbsp;' ?></td>
   <td width="30%" class="<?php echo $class ?>_m" valign="top"><?php echo implode('<br />', $changes) ?></td>
   <td width="30%" class="<?php echo $class ?>_r rightAlign" valign="top"><?php if ($comment && !$private) {