diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-15 23:07:18 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-15 23:07:18 +0200 |
| commit | 5d4e9e0d25831cbe1b9c2fef52016c6ed1bbcb55 (patch) | |
| tree | 61ee34dd5ef201fe6e8757589e244e0502c08363 | |
| parent | af0069bf032d2045abd18abf2e133835fc360481 (diff) | |
| download | nextcloud-server-5d4e9e0d25831cbe1b9c2fef52016c6ed1bbcb55.tar.gz nextcloud-server-5d4e9e0d25831cbe1b9c2fef52016c6ed1bbcb55.zip | |
/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
This fixes unit test execution
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |