From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 16 Jun 2012 07:35:53 +0000 (+0200)
Subject: Merge branch 'master' into calendar_repeat
X-Git-Tag: v4.5.0beta1~74^2~407^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a6531d0311d6401562827ed12da6cdc8560b70f7;p=nextcloud-server.git

Merge branch 'master' into calendar_repeat
---

a6531d0311d6401562827ed12da6cdc8560b70f7
diff --cc apps/calendar/ajax/events.php
index ccf6102ab46,39130a6a983..6ea89e3e5b3
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -5,8 -5,13 +5,9 @@@
   * later.
   * See the COPYING-README file.
   */
 -
 - 
 -require_once('when/When.php');
 -
  OCP\JSON::checkLoggedIn();
  OCP\JSON::checkAppEnabled('calendar');
+ session_write_close();
  
  // Look for the calendar id
  $calendar_id = null;