remove global variable $RUNTIME_NOAPPS - it's just superfluous
This commit is contained in:
parent
e2a28e5d1d
commit
afbe50d09c
|
@ -30,9 +30,6 @@ class Upgrade extends Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||||
global $RUNTIME_NOAPPS;
|
|
||||||
|
|
||||||
$RUNTIME_NOAPPS = true; //no apps, yet
|
|
||||||
|
|
||||||
require_once \OC::$SERVERROOT . '/lib/base.php';
|
require_once \OC::$SERVERROOT . '/lib/base.php';
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$RUNTIME_NOAPPS = true; //no apps, yet
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
require_once 'lib/base.php';
|
require_once 'lib/base.php';
|
||||||
|
|
|
@ -569,9 +569,8 @@ class OC {
|
||||||
|
|
||||||
// Load Apps
|
// Load Apps
|
||||||
// This includes plugins for users and filesystems as well
|
// This includes plugins for users and filesystems as well
|
||||||
global $RUNTIME_NOAPPS;
|
|
||||||
global $RUNTIME_APPTYPES;
|
global $RUNTIME_APPTYPES;
|
||||||
if (!$RUNTIME_NOAPPS && !self::checkUpgrade(false)) {
|
if (!self::checkUpgrade(false)) {
|
||||||
if ($RUNTIME_APPTYPES) {
|
if ($RUNTIME_APPTYPES) {
|
||||||
OC_App::loadApps($RUNTIME_APPTYPES);
|
OC_App::loadApps($RUNTIME_APPTYPES);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue