summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/lostpassword/controller/lostcontroller.php2
1 files changed, 1 insertions, 1 deletions
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() {