From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 23 Apr 2012 11:03:50 +0000 (+0200)
Subject: Merge branch 'master' into movable_apps
X-Git-Tag: v4.0.0beta~168^2~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1b084cc120deff1d5efd96c842c89367b283b4ce;p=nextcloud-server.git

Merge branch 'master' into movable_apps
---

1b084cc120deff1d5efd96c842c89367b283b4ce
diff --cc apps/contacts/import.php
index 8cf0a173db1,233ed5be22f..b80021e00ea
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@@ -7,9 -7,9 +7,9 @@@
   */
  //check for addressbooks rights or create new one
  ob_start();
 -require_once ('../../lib/base.php');
 + 
  OC_JSON::checkLoggedIn();
- OC_Util::checkAppEnabled('calendar');
+ OC_Util::checkAppEnabled('contacts');
  $nl = "\n";
  $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
  if(is_writable('import_tmp/')){