[Pkg-owncloud-commits] [php-sabredav] 06/09: Fixed more base url problems related to notifications.

[David Prévot]

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

taffit pushed a commit to tag 3.0.0-beta2
in repository php-sabredav.

commit d71f727d87b5c2c7015dc8908e5389d7fcafc890
Author: Evert Pot <me at evertpot.com>
Date:   Tue May 26 13:53:13 2015 -0400

    Fixed more base url problems related to notifications.
---
 lib/CalDAV/Notifications/Plugin.php                     | 2 +-
 tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php | 2 +-
 tests/Sabre/CalDAV/Xml/Notification/InviteTest.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/CalDAV/Notifications/Plugin.php b/lib/CalDAV/Notifications/Plugin.php
index effc29e..4bfb9b6 100644
--- a/lib/CalDAV/Notifications/Plugin.php
+++ b/lib/CalDAV/Notifications/Plugin.php
@@ -137,7 +137,7 @@ class Plugin extends ServerPlugin {
             return;
 
         $writer = $this->server->xml->getWriter();
-        $writer->contextUri = $request->getUrl();
+        $writer->contextUri = $this->server->getBaseUri();
         $writer->openMemory();
         $writer->startDocument('1.0', 'UTF-8');
         $writer->startElement('{http://calendarserver.org/ns/}notification');
diff --git a/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php b/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php
index a5e0342..50e31a8 100644
--- a/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php
+++ b/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php
@@ -33,7 +33,7 @@ class InviteReplyTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals($simpleExpected, $writer->outputMemory());
 
         $writer = new Writer();
-        $writer->baseUri = '/';
+        $writer->contextUri = '/';
         $writer->namespaceMap = [
             'http://calendarserver.org/ns/' => 'cs',
             'DAV:' => 'd',
diff --git a/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php b/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php
index c8e7ca7..54b9aae 100644
--- a/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php
+++ b/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php
@@ -224,7 +224,7 @@ FOO
     function writeFull($input) {
 
         $writer = new Writer();
-        $writer->baseUri = '/';
+        $writer->contextUri = '/';
         $writer->namespaceMap = $this->namespaceMap;
         $writer->openMemory();
         $writer->startElement('{http://calendarserver.org/ns/}root');

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