summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-06 10:04:18 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-06 10:04:18 +0100
commit0db5fead8e9d4cfe410841ab4c4562987f2844a6 (patch)
tree1d9c7b5fd0b2e1a1eb4d86de7da5e7e63bb016bc /lib
parent21207c6a73bbaf43c6afaceda51690e77fad06f0 (diff)
downloadnextcloud-server-0db5fead8e9d4cfe410841ab4c4562987f2844a6.tar.gz
nextcloud-server-0db5fead8e9d4cfe410841ab4c4562987f2844a6.zip
remove some more global variable $RUNTIME_NOAPPS
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php5
-rwxr-xr-xlib/private/util.php4
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/base.php b/lib/base.php
index b230ca2e548..18adfd31204 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -949,11 +949,6 @@ class OC {
}
-// define runtime variables - unless this already has been done
-if (!isset($RUNTIME_NOAPPS)) {
- $RUNTIME_NOAPPS = false;
-}
-
if (!function_exists('get_temp_dir')) {
function get_temp_dir() {
if ($temp = ini_get('upload_tmp_dir')) return $temp;
diff --git a/lib/private/util.php b/lib/private/util.php
index 0585749d615..6bccaa00261 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -32,9 +32,7 @@ class OC_Util {
}
// load all filesystem apps before, so no setup-hook gets lost
- if(!isset($RUNTIME_NOAPPS) || !$RUNTIME_NOAPPS) {
- OC_App::loadApps(array('filesystem'));
- }
+ OC_App::loadApps(array('filesystem'));
// the filesystem will finish when $user is not empty,
// mark fs setup here to avoid doing the setup from loading