mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use array_merge for merging arrays in PHP

This commit is contained in:
Morris Jobke 2014-06-13 16:18:39 +02:00
parent ed8b7fc101
commit 1cb7239cb7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lostpassword/controller/lostcontroller.php
View File

@ -72,7 +72,7 @@ class LostController extends Controller {
} }
private function error($message, array $additional=array()) { 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() { private function success() {