use array_merge for merging arrays in PHP

remotes/origin/ldap_group_count
Morris Jobke 10 years ago
parent ed8b7fc101
commit 1cb7239cb7

@ -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() {

Loading…
Cancel
Save