diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
| commit | fd5af9aff4245127f32f3b90dbd6e52792984447 (patch) | |
| tree | f77a3b903067f05f036578835700f262f6ea71a9 /apps/calendar/lib | |
| parent | c8255a170c2d7449b4e7728edd2237eea71dca80 (diff) | |
| parent | d84b1adf34817b4b261db35e51f72ac78adf8e27 (diff) | |
| download | nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.tar.gz nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.zip | |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Diffstat (limited to 'apps/calendar/lib')
| -rw-r--r-- | apps/calendar/lib/sabre/object.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php index 25954e6ee55..0d1bfa397c8 100644 --- a/apps/calendar/lib/sabre/object.php +++ b/apps/calendar/lib/sabre/object.php @@ -45,11 +45,11 @@ class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObje $uid = OC_Calendar_Calendar::extractUserID($this->getOwner()); if($uid != OCP\USER::getUser()) { - $sharedAddressbook = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']); - if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) { + $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']); + if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) { $readprincipal = 'principals/' . OCP\USER::getUser(); } - if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) { + if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) { $writeprincipal = 'principals/' . OCP\USER::getUser(); } } |