From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sun, 15 Sep 2013 21:07:18 +0000 (+0200)
Subject: /OC/Server has created too early causing issues with config operations as OC:$SERVERP... 
X-Git-Tag: v6.0.0alpha2~121^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d4e9e0d25831cbe1b9c2fef52016c6ed1bbcb55;p=nextcloud-server.git

/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized

This fixes unit test execution
---

diff --git a/lib/base.php b/lib/base.php
index 05d151439a4..1720a5fd7e1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -376,9 +376,6 @@ class OC {
 		self::$loader->registerPrefix('Patchwork', '3rdparty');
 		spl_autoload_register(array(self::$loader, 'load'));
 
-		// setup the basic server
-		self::$server = new \OC\Server();
-
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
@@ -458,6 +455,9 @@ class OC {
 		stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
+		// setup the basic server
+		self::$server = new \OC\Server();
+
 		self::initTemplateEngine();
 		if (!self::$CLI) {
 			self::initSession();