summaryrefslogtreecommitdiff
path: root/framework/Util/TSimpleDateFormatter.php
diff options
context:
space:
mode:
authorctrlaltca <>2013-01-06 23:17:29 +0000
committerctrlaltca <>2013-01-06 23:17:29 +0000
commit4af5784e5c51536e074ea51eacea7e6c79efee15 (patch)
tree3287ab749f097bbc3187bd663487a3ecbd7cd35e /framework/Util/TSimpleDateFormatter.php
parentea00eb2ea27613491eb517be9659059696fb335b (diff)
backported r3241 to trunk/
Diffstat (limited to 'framework/Util/TSimpleDateFormatter.php')
-rw-r--r--framework/Util/TSimpleDateFormatter.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php
index a1a1842a..c2fe99b0 100644
--- a/framework/Util/TSimpleDateFormatter.php
+++ b/framework/Util/TSimpleDateFormatter.php
@@ -174,7 +174,10 @@ class TSimpleDateFormatter
private function getDate($value)
{
$s = Prado::createComponent('System.Util.TDateTimeStamp');
- return $s->parseDate($value);
+ if(is_numeric($value))
+ return $s->getDate($value);
+ else
+ return $s->parseDate($value);
}
/**