[Pkg-owncloud-commits] [owncloud] 90/223: use array_merge for merging arrays in PHP

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 1cb7239cb7ea323895f9e120534f8c8f7cd04c65
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 13 16:18:39 2014 +0200

    use array_merge for merging arrays in PHP
---
 core/lostpassword/controller/lostcontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 1cab874..0212332 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() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git