Fix merge to + operator.

cakephp · Aug 24, 2015 · 3cfc46d · 3cfc46d
1 parent 51d8f74
commit 3cfc46d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Cake/Utility/CakeTime.php b/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;