Fixed #460.

2 files changed, 15 insertions, 12 deletions

diff --git a/HISTORY b/HISTORY
index 0b6bc7dd..7743786f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,7 +4,8 @@ BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
 BUG: TTableCell should render   only when Text is not set and there's no child (Qiang)
 ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)
-CHG: Ticket#454 - Redundant PHP Version Check
+CHG: Ticket#454 - Redundant PHP Version Check (Qiang)
+CHG: Ticket#460 - Validators will not perform validation if parents are disabled (Qiang)
 CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
 CHG: THttpRequest.constructUrl() now encodes ampersand by default (Qiang)
 
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index db0c9f02..621f15bc 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -482,20 +482,22 @@ abstract class TBaseValidator extends TLabel implements IValidator
 	 */
 	public function validate()
 	{
-		if($visible=$this->getVisible(true))
-			$this->onValidate();
 		$this->setIsValid(true);
-		if($this->getValidationTarget() && $visible && $this->getEnabled())
+		if($this->getVisible(true) && $this->getEnabled(true))
 		{
-			if($this->evaluateIsValid())
-			{
-				$this->setIsValid(true);
-				$this->onSuccess();
-			}
-			else
+			$this->onValidate();
+			if($this->getValidationTarget())
 			{
-				$this->setIsValid(false);
-				$this->onError();
+				if($this->evaluateIsValid())
+				{
+					$this->setIsValid(true);
+					$this->onSuccess();
+				}
+				else
+				{
+					$this->setIsValid(false);
+					$this->onError();
+				}
 			}
 		}
 		return $this->getIsValid();