From 9d375f8ef06daea97fbce6c71a8c524aca14d85d Mon Sep 17 00:00:00 2001
From: wei <>
Date: Thu, 31 Aug 2006 03:26:43 +0000
Subject: update #351

---
 framework/Util/TSimpleDateFormatter.php      | 3 ++-
 framework/Web/UI/WebControls/TDatePicker.php | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'framework')

diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php
index 9c2975d5..046a3442 100644
--- a/framework/Util/TSimpleDateFormatter.php
+++ b/framework/Util/TSimpleDateFormatter.php
@@ -118,7 +118,8 @@ class TSimpleDateFormatter
 		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
 		$bits['d'] = $date['mday'];
 
-		return str_replace(array_keys($bits), $bits, $this->pattern);
+		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
 	public function getMonthPattern()
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 02361e54..2a9340e5 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -263,14 +263,15 @@ class TDatePicker extends TTextBox
 
 	/**
 	 * Sets the date for the date picker using timestamp.
-	 * @param integer time stamp for the date picker
+	 * @param float time stamp for the date picker
 	 */
 	public function setTimeStamp($value)
 	{
-		$date = TPropertyValue::ensureInteger($value);
+		$date = TPropertyValue::ensureFloat($value);
 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		$this->setText($formatter->format($date));
+						$d =$formatter->format($date);
+		$this->setText($d);
 	}
 
 	/**
-- 
cgit v1.2.3