diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-22 17:22:02 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-22 17:22:02 +0200 |
| commit | e37b95ae53d098ffa93018e90d2443867f047a4f (patch) | |
| tree | 10949189bce5d57648127b1539da937b3b7f34ca /lib/base.php | |
| parent | 1e400cc11388c38546c92cdaf882b03c47d11c2d (diff) | |
| parent | 4eebccd81fca602eee5cc1a76edd374028826608 (diff) | |
| download | nextcloud-server-e37b95ae53d098ffa93018e90d2443867f047a4f.tar.gz nextcloud-server-e37b95ae53d098ffa93018e90d2443867f047a4f.zip | |
Merge pull request #24200 from owncloud/appframework_psr4
Move \OC\AppFramework to PSR-4
Diffstat (limited to 'lib/base.php')
| -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 0174627cb7f..fb58177a432 100644 --- a/lib/base.php +++ b/lib/base.php @@ -492,6 +492,9 @@ class OC { self::$CLI = (php_sapi_name() == 'cli'); + // Add default composer PSR-4 autoloader + require_once OC::$SERVERROOT . '/lib/composer/autoload.php'; + try { self::initPaths(); // setup 3rdparty autoloader @@ -511,9 +514,6 @@ class OC { exit(); } - // Add default composer PSR-4 autoloader - require_once OC::$SERVERROOT . '/lib/composer/autoload.php'; - // setup the basic server self::$server = new \OC\Server(\OC::$WEBROOT, self::$config); \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd); |