From 0db5fead8e9d4cfe410841ab4c4562987f2844a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Feb 2014 10:04:18 +0100
Subject: [PATCH] remove some more global variable $RUNTIME_NOAPPS
---
console.php | 1 -
core/ajax/update.php | 1 -
lib/base.php | 5 -----
lib/private/util.php | 4 +---
public.php | 1 -
remote.php | 1 -
status.php | 2 --
7 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/console.php b/console.php
index 25b8b312539..fc6957062be 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 d6af84e95b1..99e8f275316 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 b230ca2e548..18adfd31204 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 0585749d615..6bccaa00261 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 767295b98db..e072db93d29 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 2d0088cd903..d25bbdb6e7e 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 88422100f14..861eaed9cd2 100644
--- a/status.php
+++ b/status.php
@@ -21,8 +21,6 @@
*
*/
-$RUNTIME_NOAPPS = true; //no apps, yet
-
try {
require_once 'lib/base.php';
--
GitLab