Merge branch 'hotfix/4394'

Close #4394 Fixes #4393
zendframework · May 2, 2013 · dd12afa · dd12afa
2 parents 25e0265 + 9a0785b
commit dd12afa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/library/Zend/Filter/DateTimeFormatter.php b/library/Zend/Filter/DateTimeFormatter.php
@@ -71,7 +71,9 @@ public function filter($value)
      */
     protected function normalizeDateTime($value)
     {
-        if (is_int($value)) {
+        if (empty($value)) {
+            return $value;
+        } elseif (is_int($value)) {
             $dateTime = new DateTime('@' . $value);
         } elseif (!$value instanceof DateTime) {
             $dateTime = new DateTime($value);

diff --git a/tests/ZendTest/Filter/DateTimeFormatterTest.php b/tests/ZendTest/Filter/DateTimeFormatterTest.php
@@ -33,6 +33,15 @@ public function tearDown()
         date_default_timezone_set($this->defaultTimezone);
     }
 
+    public function testFormatterDoesNotFormatAnEmptyString()
+    {
+        date_default_timezone_set('UTC');
+
+        $filter = new DateTimeFormatter();
+        $result = $filter->filter('');
+        $this->assertEquals('', $result);
+    }
+
     public function testDateTimeFormatted()
     {
         date_default_timezone_set('UTC');