Merge branch 'hotfix/2633'

Close #2633
zendframework · Oct 3, 2012 · 0474ef5 · 0474ef5
2 parents 7d49e8e + 43866c8
commit 0474ef5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/library/Zend/Validator/Date.php b/library/Zend/Validator/Date.php
@@ -128,7 +128,7 @@ public function isValid($value)
             // and still return a DateTime object
             $errors = DateTime::getLastErrors();
 
-            if (false === $date || $errors['warning_count'] > 0) {
+            if ($errors['warning_count'] > 0) {
                 $this->error(self::INVALID_DATE);
                 return false;
             }

diff --git a/tests/ZendTest/Form/View/Helper/FormRowTest.php b/tests/ZendTest/Form/View/Helper/FormRowTest.php
@@ -305,4 +305,18 @@ public function testShowErrorInRadio()
         $markup = $this->helper->__invoke($element);
         $this->assertContains('<ul><li>Error message</li></ul>', $markup);
     }
+
+    public function testErrorShowTwice()
+    {
+        $element = new  Element\Date('birth');
+        $element->setFormat('Y-m-d');
+        $element->setValue('2010-13-13');
+
+        $validator = new \Zend\Validator\Date();
+        $validator->isValid($element->getValue());
+        $element->setMessages($validator->getMessages());
+
+        $markup = $this->helper->__invoke($element);
+        $this->assertEquals(2,  count(explode("<ul><li>The input does not appear to be a valid date</li></ul>", $markup)));
+    }
 }