remove some more global variable $RUNTIME_NOAPPS
This commit is contained in:
parent
21207c6a73
commit
0db5fead8e
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
use Symfony\Component\Console\Application;
|
use Symfony\Component\Console\Application;
|
||||||
|
|
||||||
$RUNTIME_NOAPPS = true;
|
|
||||||
require_once 'lib/base.php';
|
require_once 'lib/base.php';
|
||||||
|
|
||||||
// Don't do anything if ownCloud has not been installed yet
|
// Don't do anything if ownCloud has not been installed yet
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
$RUNTIME_NOAPPS = true;
|
|
||||||
require_once '../../lib/base.php';
|
require_once '../../lib/base.php';
|
||||||
|
|
||||||
if (OC::checkUpgrade(false)) {
|
if (OC::checkUpgrade(false)) {
|
||||||
|
|
|
@ -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')) {
|
if (!function_exists('get_temp_dir')) {
|
||||||
function get_temp_dir() {
|
function get_temp_dir() {
|
||||||
if ($temp = ini_get('upload_tmp_dir')) return $temp;
|
if ($temp = ini_get('upload_tmp_dir')) return $temp;
|
||||||
|
|
|
@ -32,9 +32,7 @@ class OC_Util {
|
||||||
}
|
}
|
||||||
|
|
||||||
// load all filesystem apps before, so no setup-hook gets lost
|
// 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,
|
// the filesystem will finish when $user is not empty,
|
||||||
// mark fs setup here to avoid doing the setup from loading
|
// mark fs setup here to avoid doing the setup from loading
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
$RUNTIME_NOAPPS = true;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
$RUNTIME_NOAPPS = true;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$RUNTIME_NOAPPS = true; //no apps, yet
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
require_once 'lib/base.php';
|
require_once 'lib/base.php';
|
||||||
|
|
Loading…
Reference in New Issue