summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/WebControls/TBaseValidator.php24
1 files changed, 13 insertions, 11 deletions
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 626bf13e..785282da 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->onValidationSuccess();
- }
- else
+ $this->onValidate();
+ if($this->getValidationTarget())
{
- $this->setIsValid(false);
- $this->onValidationError();
+ if($this->evaluateIsValid())
+ {
+ $this->setIsValid(true);
+ $this->onValidationSuccess();
+ }
+ else
+ {
+ $this->setIsValid(false);
+ $this->onValidationError();
+ }
}
}
return $this->getIsValid();