summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorSam Tuke <samtuke@jack-laptop.(none)>2012-04-27 13:23:58 +0100
committerSam Tuke <samtuke@jack-laptop.(none)>2012-04-27 13:23:58 +0100
commita1b309a42adb3090782c602960e9b96e6ae6e858 (patch)
tree9ed19a43b052c2837d2145623b6a4d6f3711d25c /apps/files_sharing
parent80c850d018baceca3a6197a7c21651c58d0edc25 (diff)
parent0aaf6d16a54f697fc51e075a3308716c1bc95762 (diff)
downloadnextcloud-server-a1b309a42adb3090782c602960e9b96e6ae6e858.tar.gz
nextcloud-server-a1b309a42adb3090782c602960e9b96e6ae6e858.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/ajax/getitem.php2
-rw-r--r--apps/files_sharing/ajax/setpermissions.php2
-rw-r--r--apps/files_sharing/ajax/share.php2
-rw-r--r--apps/files_sharing/ajax/unshare.php2
-rw-r--r--apps/files_sharing/ajax/userautocomplete.php2
-rw-r--r--apps/files_sharing/list.php2
6 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index ba01adffb9a..c838895efbe 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -1,7 +1,7 @@
<?php
//$RUNTIME_NOAPPS = true;
-require_once('../../../lib/base.php');
+
OC_JSON::checkAppEnabled('files_sharing');
require_once('../lib_share.php');
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 200202c704c..d46f6f0c7b4 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -1,7 +1,7 @@
<?php
//$RUNTIME_NOAPPS = true;
-require_once('../../../lib/base.php');
+
OC_JSON::checkAppEnabled('files_sharing');
require_once('../lib_share.php');
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index 9b10260da5a..cd9166913cb 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -1,7 +1,7 @@
<?php
//$RUNTIME_NOAPPS = true;
-require_once('../../../lib/base.php');
+
OC_JSON::checkAppEnabled('files_sharing');
require_once('../lib_share.php');
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index d8a72a00efe..150d6504863 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -1,7 +1,7 @@
<?php
//$RUNTIME_NOAPPS = true;
-require_once('../../../lib/base.php');
+
OC_JSON::checkAppEnabled('files_sharing');
require_once('../lib_share.php');
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 38b673ee51b..cc22a0cd1a7 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -1,7 +1,7 @@
<?php
//$RUNTIME_NOAPPS = true;
-require_once('../../../lib/base.php');
+
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('files_sharing');
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 721620dc922..a9006faf1a9 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -20,7 +20,7 @@
*
*/
-require_once('../../lib/base.php');
+
require_once('lib_share.php');
OC_Util::checkLoggedIn();