From 1f560ccd8a9e21871dbedd548fc97f231131c771 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 30 Aug 2006 12:33:43 +0000
Subject: merge from 3.0 branch till 1363.

---
 framework/Web/UI/WebControls/TDatePicker.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/WebControls/TDatePicker.php')

diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 0c3e0b9a..02361e54 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -317,14 +317,14 @@ class TDatePicker extends TTextBox
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return integer the value of the property to be validated.
+	 * @return integer the interger timestamp if valid, otherwise the original text.
 	 */
 	public function getValidationPropertyValue()
 	{
-		if($this->getText() === '')
+		if(($text = $this->getText()) === '')
 			return '';
 		$date = $this->getTimeStamp();
-		return $date == null ? '' : $date;
+		return $date == null ? $text : $date;
 	}
 
 	/**
@@ -422,7 +422,9 @@ class TDatePicker extends TTextBox
 		else
 			$year = $date['year'];
 
-		$date = @mktime(0, 0, 0, $month, $day, $year);
+		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$date = $s->getTimeStamp(0, 0, 0, $month, $day, $year);
+		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
 		$pattern = $this->getDateFormat();
 		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
@@ -509,7 +511,9 @@ class TDatePicker extends TTextBox
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
-		$date = @getdate($this->getTimeStampFromText());
+		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$date = $s->getDate($this->getTimeStampFromText());
+		//$date = @getdate($this->getTimeStampFromText());
 
 		$this->renderCalendarSelections($writer, $date);
 
-- 
cgit v1.2.3