From afbe50d09c7d9e5cbed2a09bc915ba4eaa8ced27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 6 Feb 2014 09:44:13 +0100 Subject: [PATCH] remove global variable $RUNTIME_NOAPPS - it's just superfluous --- core/command/upgrade.php | 3 --- index.php | 2 -- lib/base.php | 3 +-- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 1d105b67a0..2eded15e9f 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -30,9 +30,6 @@ class Upgrade extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - global $RUNTIME_NOAPPS; - - $RUNTIME_NOAPPS = true; //no apps, yet require_once \OC::$SERVERROOT . '/lib/base.php'; diff --git a/index.php b/index.php index 0a2f15f9f5..bd94d0e908 100755 --- a/index.php +++ b/index.php @@ -21,8 +21,6 @@ * */ -$RUNTIME_NOAPPS = true; //no apps, yet - try { require_once 'lib/base.php'; diff --git a/lib/base.php b/lib/base.php index f2d9251294..b230ca2e54 100644 --- a/lib/base.php +++ b/lib/base.php @@ -569,9 +569,8 @@ class OC { // Load Apps // This includes plugins for users and filesystems as well - global $RUNTIME_NOAPPS; global $RUNTIME_APPTYPES; - if (!$RUNTIME_NOAPPS && !self::checkUpgrade(false)) { + if (!self::checkUpgrade(false)) { if ($RUNTIME_APPTYPES) { OC_App::loadApps($RUNTIME_APPTYPES); } else {