[Pkg-owncloud-commits] [php-sabredav] 141/275: Merge branch 'calendar-auto-schedule' of github.com:fruux/sabre-dav into calendar-auto-schedule

[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 1746b9ddf25d9d183e16042785c20779a9c70e25
Merge: 77ba1eb 4cbc483
Author: Evert Pot <me at evertpot.com>
Date:   Mon Aug 11 12:59:36 2014 -0400

    Merge branch 'calendar-auto-schedule' of github.com:fruux/sabre-dav into calendar-auto-schedule

 composer.json                                      |   4 +-
 examples/sql/pgsql.propertystorage.sql             |   2 +-
 lib/CalDAV/Backend/PDO.php                         |   5 +-
 lib/CalDAV/Schedule/Inbox.php                      |   7 +-
 lib/CalDAV/Schedule/Plugin.php                     |  23 ++-
 tests/Sabre/CalDAV/Backend/AbstractPDOTest.php     |  45 +++++-
 tests/Sabre/CalDAV/Backend/AbstractTest.php        |  66 +++++++-
 tests/Sabre/CalDAV/CalendarQueryValidatorTest.php  |  48 +++---
 .../Sabre/CalDAV/Schedule/FreeBusyRequestTest.php  |  23 ++-
 tests/Sabre/CalDAV/Schedule/InboxTest.php          | 171 +++++++++++++++++++++
 10 files changed, 350 insertions(+), 44 deletions(-)

diff --cc lib/CalDAV/Schedule/Plugin.php
index 3f11c45,351dfa3..21c45e0
--- a/lib/CalDAV/Schedule/Plugin.php
+++ b/lib/CalDAV/Schedule/Plugin.php
@@@ -105,8 -105,10 +106,10 @@@ class Plugin extends ServerPlugin 
          $server->on('beforeCreateFile',    [$this, 'beforeCreateFile']);
          $server->on('beforeWriteContent',  [$this, 'beforeWriteContent']);
          $server->on('beforeUnbind',        [$this, 'beforeUnbind']);
 -        $server->on('schedule',            [$this, 'scheduleLocalDelivery']);
 +        $server->on('schedule',            [$this, 'schedulelocaldelivery']);
  
+         $ns = '{' . self::NS_CALDAV . '}';
+ 
          /**
           * This information ensures that the {DAV:}resourcetype property has
           * the correct values.

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