diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-06-13 16:18:39 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-13 16:18:39 +0200 |
| commit | 1cb7239cb7ea323895f9e120534f8c8f7cd04c65 (patch) | |
| tree | ba22439734fb2c6702d0fc4c9eefb6860a7f147d /core/lostpassword | |
| parent | ed8b7fc1019d48741b11dd25e614677a80d0a89f (diff) | |
| download | nextcloud-server-1cb7239cb7ea323895f9e120534f8c8f7cd04c65.tar.gz nextcloud-server-1cb7239cb7ea323895f9e120534f8c8f7cd04c65.zip | |
use array_merge for merging arrays in PHP
Diffstat (limited to 'core/lostpassword')
| -rw-r--r-- | core/lostpassword/controller/lostcontroller.php | 2 |
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() { |