[Pkg-owncloud-commits] [owncloud] 47/134: fixing method names

[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 46657ad8a6a345daf8404f2e4f5d49cad2030e56
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Mar 12 10:00:22 2014 +0100

    fixing method names
---
 lib/private/api.php | 2 +-
 ocs/v1.php          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/private/api.php b/lib/private/api.php
index 00f80b5..0d155b9 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -358,7 +358,7 @@ class OC_API {
 	/**
 	 * Based on the requested format the response content type is set
 	 */
-	public static function setOcsContentType() {
+	public static function setContentType() {
 		$format = \OC_API::requestedFormat();
 		if ($format === 'xml') {
 			header('Content-type: text/xml; charset=UTF-8');
diff --git a/ocs/v1.php b/ocs/v1.php
index 9d84f48..4cbc857 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -31,7 +31,6 @@ try {
 	OC_API::setContentType();
 	OC_OCS::notFound();
 } catch (MethodNotAllowedException $e) {
-	setOcsContentType();
 	OC_API::setContentType();
 	OC_Response::setStatus(405);
 }

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