Recommitted r3135 that got inadvertently reverted in r3159; fixes #394, #428

1 files changed, 2 insertions, 1 deletions

diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index db1bba32..08c677b1 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -507,7 +507,6 @@ abstract class TBaseValidator extends TLabel implements IValidator
 	 */
 	public function validate()
 	{
-		$this->setIsValid(true);
 		$this->onValidate();
 		if($this->getVisible(true) && $this->getEnabled(true))
 		{
@@ -536,6 +535,8 @@ abstract class TBaseValidator extends TLabel implements IValidator
 				$this->setIsValid(true);
 				$this->onValidationSuccess();
 			}
+		} else {
+			$this->setIsValid(true);
 		}
 		return $this->getIsValid();
 	}