[Pkg-owncloud-commits] [php-sabredav] 21/29: Revert "Using the displayname as provided by a sharee."

[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 9a0cf4840032c51aecced16fd4c09a3701d72526
Author: Evert Pot <me at evertpot.com>
Date:   Mon Jun 27 21:37:31 2016 -0400

    Revert "Using the displayname as provided by a sharee."
    
    This reverts commit 1532788cd853010f25c474b63e250d5297264c7f.
---
 lib/CalDAV/Backend/PDO.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/CalDAV/Backend/PDO.php b/lib/CalDAV/Backend/PDO.php
index 6940ff4..b1c013d 100644
--- a/lib/CalDAV/Backend/PDO.php
+++ b/lib/CalDAV/Backend/PDO.php
@@ -1370,8 +1370,8 @@ INSERT INTO ' . $this->calendarInstancesTableName . '
         ?,
         ?,
         ?,
+        displayname,
         ?,
-        COALESCE(?, displayname),
         description,
         calendarorder,
         calendarcolor,
@@ -1425,7 +1425,6 @@ INSERT INTO ' . $this->calendarInstancesTableName . '
                 $calendarId,
                 $sharee->principal,
                 $sharee->access,
-                isset($sharee->properties['{DAV:}displayname']) ? $sharee->properties['{DAV:}displayname'] : null,
                 \Sabre\DAV\UUIDUtil::getUUID(),
                 $sharee->href,
                 isset($sharee->properties['{DAV:}displayname']) ? $sharee->properties['{DAV:}displayname'] : null,

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