diff --git a/console.php b/console.php index 25b8b312539309e2c4ff8b4dcdb29d98602e7470..fc6957062be9d6d770fcbd1463658087b8e2b461 100644 --- a/console.php +++ b/console.php @@ -8,7 +8,6 @@ use Symfony\Component\Console\Application; -$RUNTIME_NOAPPS = true; require_once 'lib/base.php'; // Don't do anything if ownCloud has not been installed yet diff --git a/core/ajax/update.php b/core/ajax/update.php index d6af84e95b1126377a248754df903b6af5239de4..99e8f275316ad5bb28ebce15bb89ef302b8681a3 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -1,6 +1,5 @@ <?php set_time_limit(0); -$RUNTIME_NOAPPS = true; require_once '../../lib/base.php'; if (OC::checkUpgrade(false)) { diff --git a/lib/base.php b/lib/base.php index b230ca2e548b2269e07dca102425b34e2c26a6d0..18adfd312042478acece39aaeec760bab86d6f04 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 0585749d615f62e67cc03a30384582cc2f78b387..6bccaa00261f13130425dc85359d30bfb70e4d9d 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 diff --git a/public.php b/public.php index 767295b98db100476f1119488443df88191a3835..e072db93d29dc7b0daf6c896269ec17b3cc39168 100644 --- a/public.php +++ b/public.php @@ -1,5 +1,4 @@ <?php -$RUNTIME_NOAPPS = true; try { diff --git a/remote.php b/remote.php index 2d0088cd903b04d2a8c1dbd9e56d65fb59c71d6c..d25bbdb6e7ecdddb2466dd511e369654b8a608e8 100644 --- a/remote.php +++ b/remote.php @@ -1,5 +1,4 @@ <?php -$RUNTIME_NOAPPS = true; try { diff --git a/status.php b/status.php index 88422100f14cf96afb6b637ecb139520efa8807e..861eaed9cd2638c3fe8ca3099d9f4ae811bb3981 100644 --- a/status.php +++ b/status.php @@ -21,8 +21,6 @@ * */ -$RUNTIME_NOAPPS = true; //no apps, yet - try { require_once 'lib/base.php';