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/TBaseValidator.php | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 6660184e..ff026b49 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -167,6 +167,10 @@ abstract class TBaseValidator extends TLabel implements IValidator
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
 		$options['ControlType'] = $this->getClientControlClass($control);
+		
+		//get date format from date picker target control
+		if($control instanceof TDatePicker)
+			$options['DateFormat'] = $control->getDateFormat();
 
 		if(!is_null($this->_clientSide))
 			$options = array_merge($options,$this->_clientSide->getOptions()->toArray());
-- 
cgit v1.2.3