[Pkg-owncloud-commits] [owncloud] 28/111: Update lib/private/api.php after merge conflict

[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 790055571db1a7ebb0cd93d0ec8d1a5e75cbc702
Author: tomneedham <tom at owncloud.com>
Date:   Thu Nov 14 01:00:14 2013 +0000

    Update lib/private/api.php after merge conflict
---
 lib/private/api.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/api.php b/lib/private/api.php
index 45e7f18..913b3ff 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -185,7 +185,7 @@ class OC_API {
 			} else {
 				$data = array_merge_recursive($data, $response['response']->getData());
 			}
-			$codes[] = $response->getStatusCode();
+			$codes[] = $response['response']->getStatusCode();
 		}
 
 		// Use any non 100 status codes

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