diff options
-rw-r--r-- | apps/bookmarks/ajax/addBookmark.php | 7 | ||||
-rw-r--r-- | apps/bookmarks/ajax/delBookmark.php | 5 | ||||
-rw-r--r-- | apps/bookmarks/ajax/editBookmark.php | 5 | ||||
-rw-r--r-- | apps/bookmarks/ajax/recordClick.php | 5 | ||||
-rw-r--r-- | apps/bookmarks/ajax/updateList.php | 5 | ||||
-rw-r--r-- | apps/files_sharing/get.php | 2 | ||||
-rw-r--r-- | apps/media/ajax/autoupdate.php | 3 | ||||
-rw-r--r-- | apps/remoteStorage/ajax/revokeToken.php | 4 | ||||
-rw-r--r-- | apps/remoteStorage/auth.php | 3 | ||||
-rw-r--r-- | files/webdav.php | 2 | ||||
-rw-r--r-- | lib/base.php | 3 | ||||
-rw-r--r-- | public.php | 1 | ||||
-rw-r--r-- | remote.php | 1 |
13 files changed, 2 insertions, 44 deletions
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index 483716405a1..c8a64d531c9 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); @@ -34,4 +29,4 @@ OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); $id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']); -OCP\JSON::success(array('data' => $id));
\ No newline at end of file +OCP\JSON::success(array('data' => $id)); diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php index f40f02ebab7..ba1dfff3bed 100644 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php index 0b37d161af1..ad43be064f0 100644 --- a/apps/bookmarks/ajax/editBookmark.php +++ b/apps/bookmarks/ajax/editBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php index 1eee1718d13..0283f09f60d 100644 --- a/apps/bookmarks/ajax/recordClick.php +++ b/apps/bookmarks/ajax/recordClick.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index 4de2475d067..cf9a2cf9183 100644 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -22,11 +22,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index 70a5162d382..1d219719b2d 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -1,6 +1,4 @@ <?php -$RUNTIME_NOSETUPFS=true; //don't setup the fs yet - // only need authentication apps $RUNTIME_APPTYPES=array('authentication'); OC_App::loadApps($RUNTIME_APPTYPES); diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index c2dbf27a004..7329e91e210 100644 --- a/apps/media/ajax/autoupdate.php +++ b/apps/media/ajax/autoupdate.php @@ -23,9 +23,8 @@ header('Content-type: text/html; charset=UTF-8') ; -//no apps or filesystem +//no apps $RUNTIME_NOAPPS=true; -$RUNTIME_NOSETUPFS=true; OCP\JSON::checkAppEnabled('media'); diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php index 322d9ed7279..e6a68189945 100644 --- a/apps/remoteStorage/ajax/revokeToken.php +++ b/apps/remoteStorage/ajax/revokeToken.php @@ -25,10 +25,6 @@ * */ - -// Do not load FS ... -$RUNTIME_NOSETUPFS = true; - OCP\App::checkAppEnabled('remoteStorage'); require_once('remoteStorage/lib_remoteStorage.php'); diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php index 215dfa0742c..91ca43ea076 100644 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -27,9 +27,6 @@ header("X-Frame-Options: Sameorigin"); -// Do not load FS ... -$RUNTIME_NOSETUPFS = true; - OCP\App::checkAppEnabled('remoteStorage'); require_once('Sabre/autoload.php'); require_once('lib_remoteStorage.php'); diff --git a/files/webdav.php b/files/webdav.php index 53673dbeca2..c19c4c6b72f 100644 --- a/files/webdav.php +++ b/files/webdav.php @@ -23,8 +23,6 @@ * */ -// Do not load FS ... -$RUNTIME_NOSETUPFS = true; // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); require_once('../lib/base.php'); diff --git a/lib/base.php b/lib/base.php index c3887dec2f8..c5827064d75 100644 --- a/lib/base.php +++ b/lib/base.php @@ -401,9 +401,6 @@ class OC{ } // define runtime variables - unless this already has been done -if( !isset( $RUNTIME_NOSETUPFS )){ - $RUNTIME_NOSETUPFS = false; -} if( !isset( $RUNTIME_NOAPPS )){ $RUNTIME_NOAPPS = false; } diff --git a/public.php b/public.php index 8383f36a246..0581631f41f 100644 --- a/public.php +++ b/public.php @@ -1,5 +1,4 @@ <?php -$RUNTIME_NOSETUPFS = true; $RUNTIME_NOAPPS = TRUE; require_once('lib/base.php'); $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service'])); diff --git a/remote.php b/remote.php index 483b19555c8..41d2a7ab349 100644 --- a/remote.php +++ b/remote.php @@ -1,5 +1,4 @@ <?php -$RUNTIME_NOSETUPFS = true; $RUNTIME_NOAPPS = TRUE; require_once('lib/base.php'); $path_info = OC_Request::getPathInfo(); |