[Pkg-owncloud-commits] [php-sabredav] 168/275: Changed this to a default clause.

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit 11ac18375b786e27320c8cc8d47f6ddf4128e982
Author: Evert Pot <me at evertpot.com>
Date:   Thu Aug 21 14:56:13 2014 -0400

    Changed this to a default clause.
---
 lib/CardDAV/Plugin.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/CardDAV/Plugin.php b/lib/CardDAV/Plugin.php
index f8fa5fe..fb6a9eb 100644
--- a/lib/CardDAV/Plugin.php
+++ b/lib/CardDAV/Plugin.php
@@ -744,16 +744,12 @@ class Plugin extends DAV\ServerPlugin {
             ]
         );
 
-        if (is_null($result)) {
-            // If no accept header was specified, we default to this.
-            $result = 'text/vcard; version=3.0';
-        }
-
         // Transforming.
         $vobj = VObject\Reader::read($response->getBody());
 
         switch($result) {
 
+            default :
             case 'text/x-vcard' :
             case 'text/vcard' :
             case 'text/vcard; version=3.0' :

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