Merge branch 'master' into 2574

zendframework · Jan 3, 2013 · 3cfe9f5 · 3cfe9f5
commit 3cfe9f5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -365,11 +365,11 @@ protected function generateRandomId()
      */
     public function isValid($value, $context = null)
     {
-        if (!is_array($value) && !is_array($context)) {
-            $this->error(self::MISSING_VALUE);
-            return false;
-        }
-        if (!is_array($value) && is_array($context)) {
+        if (!is_array($value)) {
+            if (!is_array($context)) {
+                $this->error(self::MISSING_VALUE);
+                return false;
+            }
             $value = $context;
         }