upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-19 02:38:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

use array_merge for merging arrays in PHP

Browse source
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()) {
return array_combine(array('status' => 'error', 'msg' => $message), $additional);
return array_merge(array('status' => 'error', 'msg' => $message), $additional);
}
private function success() {