From 3cfc46db389016dffcfca350e6e1bfa30534f467 Mon Sep 17 00:00:00 2001
From: Mark Scherer <euromark@web.de>
Date: Mon, 24 Aug 2015 06:33:04 +0200
Subject: [PATCH] Fix merge to + operator.

---
 lib/Cake/Utility/CakeTime.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
index 2cfcaff90..f59d6d6d0 100644
--- a/lib/Cake/Utility/CakeTime.php
+++ b/lib/Cake/Utility/CakeTime.php
@@ -1090,12 +1090,13 @@ class CakeTime {
 				'group' => $options,
 			);
 		}
-		$options = array_merge(array(
+		$defaults = array(
 			'group' => true,
 			'abbr' => false,
 			'before' => ' - ',
 			'after' => null,
-		), $options);
+		);
+		$options += $defaults;
 		$group = $options['group'];
 
 		$regex = null;