[Pkg-owncloud-commits] [php-sabredav] 04/29: No longer throwing an error on unknown privileges.

[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 c8b0d03a0bcac520e6e857825146ee1e6377d924
Author: Evert Pot <me at evertpot.com>
Date:   Tue May 17 00:44:47 2016 -0400

    No longer throwing an error on unknown privileges.
    
    Fixes #833
---
 CHANGELOG.md          | 6 ++++++
 lib/DAVACL/Plugin.php | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42bdd34..237fbfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ChangeLog
 =========
 
+3.2.0-alpha2 (2016-??-??)
+-------------------------
+
+* #833: Calendars throw exceptions when the sharing plugin is not enabled.
+
+
 3.2.0-alpha1 (2016-05-09)
 -------------------------
 
diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php
index d863e7b..59a7b09 100644
--- a/lib/DAVACL/Plugin.php
+++ b/lib/DAVACL/Plugin.php
@@ -686,7 +686,9 @@ class Plugin extends DAV\ServerPlugin {
             $collected2[] = $current['privilege'];
 
             if (!isset($flat[$current['privilege']])) {
-                throw new \Sabre\DAV\Exception('A node has the "' . $current['privilege'] . '" in its ACL list, but this privilege was not reported in the supportedPrivilegeSet list');
+                // Ignoring privileges that are not in the supported-privileges list.
+                $this->server->getLogger()->debug('A node has the "' . $current['privilege'] . '" in its ACL list, but this privilege was not reported in the supportedPrivilegeSet list. This will be ignored.');
+                continue;
             }
             foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
                 $collected2[] = $subPriv;

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