Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286
zendframework · Jan 3, 2013 · 08a322a · 08a322a
commit 08a322a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/File/Upload.php b/src/File/Upload.php
@@ -206,9 +206,9 @@ public function isValid($value, $file = null)
 
         if (count($this->getMessages()) > 0) {
             return false;
-        } else {
-            return true;
         }
+
+        return true;
     }
 
     /**

diff --git a/src/StringLength.php b/src/StringLength.php
@@ -190,8 +190,8 @@ public function isValid($value)
 
         if (count($this->getMessages())) {
             return false;
-        } else {
-            return true;
         }
+
+        return true;
     }
 }