From b7f95ce37ae577e95a81e64aa2aaf3e2e698109d Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 5 Aug 2006 21:34:30 +0000
Subject: merge from 3.0 branch till 1329.

---
 framework/Web/UI/WebControls/TDatePicker.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(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 42cb305e..001c7c46 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -296,7 +296,8 @@ class TDatePicker extends TTextBox
 	{
 		if($this->getText() === '')
 			return '';
-		return $this->getTimeStamp();
+		$date = $this->getTimeStamp();
+		return $date == null ? '' : $date;
 	}
 
 	/**
-- 
cgit v1.2.3