From d5e9af23e2c0862f82603cd92fe3b82a653c72c7 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 16 Dec 2008 04:25:43 +0000
Subject: [PATCH] Forward port login history date display fix.

---
 docs/changelog/7.x.x.txt             | 1 +
 lib/WebGUI/Operation/LoginHistory.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 77b8e6fab..ed2cb9f00 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -14,6 +14,7 @@
  - fixed #8838: Gallery Cross Publish template is broken
  - fixed #8898: versioning problem
  - fixed #9315: Password Recovery
+ - fixed #9298: Inconsistent date formats
 
 7.6.6
  - fixed #8792: Image Preview gives ERROR in Collateral Manager
diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm
index dce1bb102..b73e96801 100644
--- a/lib/WebGUI/Operation/LoginHistory.pm
+++ b/lib/WebGUI/Operation/LoginHistory.pm
@@ -59,7 +59,7 @@ sub www_viewLoginHistory {
 		$data{username} = $i18n->get('unknown user') if ($data{userId} eq "0");
 		$row[$i] = '<tr class="tableData"><td>'.$data{username}.' ('.$data{userId}.')</td>';
 		$row[$i] .= '<td>'.$data{status}.'</td>';
-		$row[$i] .= '<td>'.$session->datetime->epochToHuman($data{timeStamp},"%H:%n%p %M/%D/%y").'</td>';
+		$row[$i] .= '<td>'.$session->datetime->epochToHuman($data{timeStamp}).'</td>';
 		$row[$i] .= '<td>'.$data{ipAddress}.'</td>';
 		$row[$i] .= '<td>'.$data{userAgent}.'</td>';
         $row[$i] .= '<td>'.$data{sessionId}.'</td>';