Skip to content
Snippets Groups Projects
Commit bccd3725 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud...

Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
parents 7050f0fa 4cc3a309
No related branches found
No related tags found
No related merge requests found
...@@ -212,6 +212,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { ...@@ -212,6 +212,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
* @return void * @return void
*/ */
public function deleteCalendar($calendarId) { 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); OC_Calendar_Calendar::deleteCalendar($calendarId);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment