From 26c3775697fc94086269d54099576679137e5eda Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 14 Jul 2006 05:27:35 +0000
Subject: Fixed #284

---
 framework/Web/UI/WebControls/TCustomValidator.php | 10 ++++++++++
 framework/Web/UI/WebControls/TTextHighlighter.php |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/Web/UI/WebControls/TCustomValidator.php b/framework/Web/UI/WebControls/TCustomValidator.php
index 32510f89..2afa48dc 100644
--- a/framework/Web/UI/WebControls/TCustomValidator.php
+++ b/framework/Web/UI/WebControls/TCustomValidator.php
@@ -120,6 +120,16 @@ class TCustomValidator extends TBaseValidator
 			$options['ClientValidationFunction']=$clientJs;
 		return $options;
 	}
+	
+	/**
+	 * Only register the client-side validator if 
+	 * {@link setClientValidationFunction ClientValidationFunction} is set.
+	 */
+	protected function registerClientScriptValidator()
+	{
+		if($this->getClientValidationFunction()!=='')
+			parent::registerClientScriptValidator();
+	}
 }
 
 /**
diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php
index a9ccf5bb..f4e72895 100644
--- a/framework/Web/UI/WebControls/TTextHighlighter.php
+++ b/framework/Web/UI/WebControls/TTextHighlighter.php
@@ -136,7 +136,7 @@ class TTextHighlighter extends TTextProcessor
 		$geshi->enable_classes();
 		if($this->getEnableCopyCode())
 			$geshi->set_header_content($this->getHeaderTemplate());
-
+		
 		return $geshi->parse_code();
 	}
 
-- 
cgit v1.2.3