diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-27 14:17:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-27 14:17:55 +0200 |
| commit | bccd372565225ee98dcfacdd57fe512c89046ba1 (patch) | |
| tree | 6750bf17128d337f7304a65b38aa01a47aa32312 | |
| parent | 7050f0fa67ac4dd17e9712f9cc823f98c7452d1d (diff) | |
| parent | 4cc3a3096a5ad28a070db12424db586c40457243 (diff) | |
| download | nextcloud-server-bccd372565225ee98dcfacdd57fe512c89046ba1.tar.gz nextcloud-server-bccd372565225ee98dcfacdd57fe512c89046ba1.zip | |
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
| -rwxr-xr-x | 3rdparty/Sabre/DAV/Server.php | 2 | ||||
| -rw-r--r-- | apps/calendar/lib/connector_sabre.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php index 0dfac8b0c71..67794964b4b 100755 --- a/3rdparty/Sabre/DAV/Server.php +++ b/3rdparty/Sabre/DAV/Server.php @@ -656,7 +656,7 @@ class Sabre_DAV_Server { * @return void */ protected function httpDelete($uri) { - + if (!$this->broadcastEvent('beforeUnbind',array($uri))) return; $this->tree->delete($uri); $this->broadcastEvent('afterUnbind',array($uri)); diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php index 8eea06da7e2..ac3b26ceb33 100644 --- a/apps/calendar/lib/connector_sabre.php +++ b/apps/calendar/lib/connector_sabre.php @@ -212,6 +212,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { * @return void */ public function deleteCalendar($calendarId) { + if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )){ + throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403); + } + OC_Calendar_Calendar::deleteCalendar($calendarId); } |