mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Georg Ehrke 2012-07-27 14:17:55 +02:00
parent 7050f0fa67 4cc3a3096a
commit bccd372565
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/Sabre/DAV/Server.php vendored
View File

@ -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));

4
apps/calendar/lib/connector_sabre.php
View File

@ -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);
}