diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-20 13:35:23 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-24 15:11:54 +0100 |
| commit | ae36c01b959d1cbdaeabb46d30cb416aae428a88 (patch) | |
| tree | 8a7e577b3565d20ab1a14896e6cf0bd05054e119 /apps/dav/lib/carddav | |
| parent | eacb24c1518ca80871447fbb500f093a0c280ee6 (diff) | |
| download | nextcloud-server-ae36c01b959d1cbdaeabb46d30cb416aae428a88.tar.gz nextcloud-server-ae36c01b959d1cbdaeabb46d30cb416aae428a88.zip | |
Adjust sabre changes in core
Diffstat (limited to 'apps/dav/lib/carddav')
| -rw-r--r-- | apps/dav/lib/carddav/addressbook.php | 6 | ||||
| -rw-r--r-- | apps/dav/lib/carddav/useraddressbooks.php | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/carddav/addressbook.php index e50f6f4adf6..eff1ad321e5 100644 --- a/apps/dav/lib/carddav/addressbook.php +++ b/apps/dav/lib/carddav/addressbook.php @@ -3,13 +3,9 @@ namespace OCA\DAV\CardDAV; use OCA\DAV\CardDAV\Sharing\IShareableAddressBook; -use OCP\IUserManager; class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareableAddressBook { - /** @var IUserManager */ - private $userManager; - public function __construct(CardDavBackend $carddavBackend, array $addressBookInfo) { parent::__construct($carddavBackend, $addressBookInfo); } @@ -55,4 +51,4 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareableAddres $carddavBackend = $this->carddavBackend; $carddavBackend->getShares($this->getName()); } -}
\ No newline at end of file +} diff --git a/apps/dav/lib/carddav/useraddressbooks.php b/apps/dav/lib/carddav/useraddressbooks.php index adbb0292fa7..5f618a0ece3 100644 --- a/apps/dav/lib/carddav/useraddressbooks.php +++ b/apps/dav/lib/carddav/useraddressbooks.php @@ -2,7 +2,7 @@ namespace OCA\DAV\CardDAV; -class UserAddressBooks extends \Sabre\CardDAV\UserAddressBooks { +class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome { /** * Returns a list of addressbooks |