]> source.dussan.org Git - nextcloud-server.git/commitdiff
Update lib/private/api.php after merge conflict
authortomneedham <tom@owncloud.com>
Thu, 14 Nov 2013 01:00:14 +0000 (01:00 +0000)
committertomneedham <tom@owncloud.com>
Thu, 14 Nov 2013 01:00:14 +0000 (01:00 +0000)
lib/private/api.php

index 45e7f18bd4ede74628f3019e78991cf030f232b6..913b3ff0a184193c8fe1787df0029dcc053f12b5 100644 (file)
@@ -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