From 45ee387f92b19d3d0f39be09582f902f64a86edf Mon Sep 17 00:00:00 2001
From: Thiago Talma <thiago@thiagomt.com>
Date: Tue, 29 Jul 2014 21:48:53 -0300
Subject: [PATCH] It is not required by default when you set the "when"
 attribute

---
 framework/base/Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/Model.php b/framework/base/Model.php
index 9186b870bc..bf27c6f6ea 100644
--- a/framework/base/Model.php
+++ b/framework/base/Model.php
@@ -442,7 +442,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
     public function isAttributeRequired($attribute)
     {
         foreach ($this->getActiveValidators($attribute) as $validator) {
-            if ($validator instanceof RequiredValidator) {
+            if ($validator instanceof RequiredValidator && !$validator->when) {
                 return true;
             }
         }