Skip to content

Commit

Permalink
Fixes zendframework#2 - Long Timezones in Zend_Date constructor ignor…
Browse files Browse the repository at this point in the history
…ed with custom date format
  • Loading branch information
froschdesign committed Mar 31, 2014
1 parent 24a65a6 commit dd81d45
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit dd81d45

Please sign in to comment.