Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -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%">
Expand Down
2 changes: 1 addition & 1 deletion lib/Form/Renderer/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading