Skip to content
Permalink
Browse files

Fix merge to + operator.

  • Loading branch information...
dereuromark committed Aug 24, 2015
1 parent 51d8f74 commit 3cfc46db389016dffcfca350e6e1bfa30534f467
Showing with 3 additions and 2 deletions.
  1. +3 −2 lib/Cake/Utility/CakeTime.php
@@ -1090,12 +1090,13 @@ public static function listTimezones($filter = null, $country = null, $options =
'group' => $options,
);
}
$options = array_merge(array(
$defaults = array(
'group' => true,
'abbr' => false,
'before' => ' - ',
'after' => null,
), $options);
);
$options += $defaults;
$group = $options['group'];
$regex = null;

0 comments on commit 3cfc46d

Please sign in to comment.
You can’t perform that action at this time.