diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 09:44:13 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-06 09:44:13 +0100 |
| commit | afbe50d09c7d9e5cbed2a09bc915ba4eaa8ced27 (patch) | |
| tree | c98d572903f96aff1adba8e8859fcf74bc58da5b | |
| parent | e2a28e5d1d1e7956ab37884da7439ef56836655c (diff) | |
| download | nextcloud-server-afbe50d09c7d9e5cbed2a09bc915ba4eaa8ced27.tar.gz nextcloud-server-afbe50d09c7d9e5cbed2a09bc915ba4eaa8ced27.zip | |
remove global variable $RUNTIME_NOAPPS - it's just superfluous
| -rw-r--r-- | core/command/upgrade.php | 3 | ||||
| -rwxr-xr-x | index.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 1d105b67a06..2eded15e9fe 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 0a2f15f9f5e..bd94d0e908d 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 f2d9251294d..b230ca2e548 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 { |