[Pkg-owncloud-commits] [php-sabredav] 254/275: Ensuring the caldav plugin handles incoming iCalendar before the schedule plugin.

[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 6c0d6ea391f0382e18851e5650a84892d06c6f53
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Sep 22 13:35:44 2014 +0100

    Ensuring the caldav plugin handles incoming iCalendar before the schedule plugin.
    
    This allows the caldav plugin to transform from jCard first.
---
 lib/CalDAV/Plugin.php          | 2 +-
 lib/CalDAV/Schedule/Plugin.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index ae7f2fd..b4cbde7 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -173,8 +173,8 @@ class Plugin extends DAV\ServerPlugin {
         $server->on('propFind',            [$this,'propFind']);
         $server->on('onHTMLActionsPanel',  [$this,'htmlActionsPanel']);
         $server->on('onBrowserPostAction', [$this,'browserPostAction']);
-        $server->on('beforeWriteContent',  [$this,'beforeWriteContent']);
         $server->on('beforeCreateFile',    [$this,'beforeCreateFile']);
+        $server->on('beforeWriteContent',  [$this,'beforeWriteContent']);
         $server->on('afterMethod:GET',     [$this,'httpAfterGET']);
 
         $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
diff --git a/lib/CalDAV/Schedule/Plugin.php b/lib/CalDAV/Schedule/Plugin.php
index 9f623ce..e6cf494 100644
--- a/lib/CalDAV/Schedule/Plugin.php
+++ b/lib/CalDAV/Schedule/Plugin.php
@@ -103,8 +103,8 @@ class Plugin extends ServerPlugin {
         $this->server = $server;
         $server->on('method:POST',         [$this, 'httpPost']);
         $server->on('propFind',            [$this, 'propFind']);
-        $server->on('beforeCreateFile',    [$this, 'beforeCreateFile']);
-        $server->on('beforeWriteContent',  [$this, 'beforeWriteContent']);
+        $server->on('beforeCreateFile',    [$this, 'beforeCreateFile'], 110);
+        $server->on('beforeWriteContent',  [$this, 'beforeWriteContent'], 110);
         $server->on('beforeUnbind',        [$this, 'beforeUnbind']);
         $server->on('schedule',            [$this, 'scheduleLocalDelivery']);
 

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