From cb0aeb81d77d7170196f1b667978f56c6018100b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 25 Nov 2006 20:51:43 +0000
Subject: merge from 3.0 branch till 1508.

---
 framework/I18N/core/DateFormat.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'framework/I18N')

diff --git a/framework/I18N/core/DateFormat.php b/framework/I18N/core/DateFormat.php
index 142926f4..8dd3fdca 100644
--- a/framework/I18N/core/DateFormat.php
+++ b/framework/I18N/core/DateFormat.php
@@ -110,13 +110,17 @@ class DateFormat
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if(is_string($time))
+		if (is_numeric($time)) //assumes unix epoch
+			$time = floatval($time);
+		else if(is_string($time))
 			$time = @strtotime($time);
 
 		if(is_null($pattern))
 			$pattern = 'F';
 
-		$date = @getdate($time);
+		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+
+		$date = $s->getDate($time);
 
 		$pattern = $this->getPattern($pattern);
 
-- 
cgit v1.2.3