use array_merge for merging arrays in PHP

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 1cab87432ca9095a297e79a535f2fe2b5abaef1d..021233235f0f52a3c54f231c7c2280aaec914b33 100644 (file)
--- 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() {