From f41acbd1542e2f3e45dd84985e14deff9aef46e6 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Wed, 20 May 2009 17:04:18 -0400 Subject: [PATCH] don't overwrite/lose tokens when re-ordering --- framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php index 511c7a971..da4b3f54a 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php @@ -368,7 +368,7 @@ class Horde_Date_Parser_Locale_Base { $newTokens = array($tokens[1], $tokens[0], $tokens[2]); $timeTokens = array_slice($tokens, 3); - return $this->handle_rmn_sd_sy($newTokens + $timeTokens, $options); + return $this->handle_rmn_sd_sy(array_merge($newTokens, $timeTokens), $options); } public function handle_sm_sd_sy($tokens, $options) @@ -391,14 +391,14 @@ class Horde_Date_Parser_Locale_Base { $newTokens = array($tokens[1], $tokens[0], $tokens[2]); $timeTokens = array_slice($tokens, 3); - return $this->handle_sm_sd_sy($newTokens + $timeTokens, $options); + return $this->handle_sm_sd_sy(array_merge($newTokens, $timeTokens), $options); } public function handle_sy_sm_sd($tokens, $options) { $newTokens = array($tokens[1], $tokens[2], $tokens[0]); $timeTokens = array_slice($tokens, 3); - return $this->handle_sm_sd_sy($newTokens + $timeTokens, $options); + return $this->handle_sm_sd_sy(array_merge($newTokens, $timeTokens), $options); } public function handle_sm_sy($tokens, $options) -- 2.11.0