Skip to content
Snippets Groups Projects
Commit 1cb7239c authored by Morris Jobke's avatar Morris Jobke
Browse files

use array_merge for merging arrays in PHP

parent ed8b7fc1
No related branches found
No related tags found
No related merge requests found
......@@ -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() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment