From 1cb7239cb7ea323895f9e120534f8c8f7cd04c65 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 13 Jun 2014 16:18:39 +0200
Subject: [PATCH] use array_merge for merging arrays in PHP
---
core/lostpassword/controller/lostcontroller.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 1cab87432ca..021233235f0 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -72,7 +72,7 @@ class LostController extends Controller {
}
private function error($message, array $additional=array()) {
- return array_combine(array('status' => 'error', 'msg' => $message), $additional);
+ return array_merge(array('status' => 'error', 'msg' => $message), $additional);
}
private function success() {
--
GitLab