Merge pull request #315 from froschdesign/hotfix/2

Fixes #2 - Long Timezones in Zend_Date constructor ignored with custom d...
zendframework · Apr 1, 2014 · 4afa824 · 4afa824
2 parents 810ac28 + a40d412
commit 4afa824
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/library/Zend/Date.php b/library/Zend/Date.php
@@ -1208,7 +1208,7 @@ public function getTimezoneFromString($zone)
             return $zone;
         }
 
-        preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
+        preg_match('/([[:alpha:]\/_]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
         try {
             if (!empty($match) and (!is_int($match[count($match) - 1]))) {
                 $oldzone = $this->getTimezone();

diff --git a/tests/Zend/DateTest.php b/tests/Zend/DateTest.php
@@ -5698,6 +5698,24 @@ public function testDateShouldMatchOnFirstDayOfYear()
         $out  = $date->toString('Y-MM-dd');
         $this->assertEquals('2012-01-01', $out);
     }
+
+    /**
+     * @group GH-2
+     */
+    public function testGetTimezoneFromStringForTimezonesWithUnderscore()
+    {
+        $date = new Zend_Date();
+
+        $this->assertEquals(
+            'America/Los_Angeles',
+            $date->getTimezoneFromString('America/Los_Angeles')
+        );
+
+        $this->assertEquals(
+            'America/New_York',
+            $date->getTimezoneFromString('America/New_York')
+        );
+    }
 }
 
 class Zend_Date_TestHelper extends Zend_Date