diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-04-22 15:28:09 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-04-22 15:28:09 +0200 |
| commit | 1d33a5ef133d917074a94d40a939b6cbbe698711 (patch) | |
| tree | 6880e3e6eb5b5c5be2a39d078416f92e7b359b91 /lib/base.php | |
| parent | 606b756a94643eaae87e18b39f6c75e6d18fec7e (diff) | |
| download | nextcloud-server-1d33a5ef133d917074a94d40a939b6cbbe698711.tar.gz nextcloud-server-1d33a5ef133d917074a94d40a939b6cbbe698711.zip | |
Move \OC\AppFramework to PSR-4
* Also moved the autoloader setup a bit up since we need it in initpaths
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 8ea164a5007..87e69842cb5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -488,6 +488,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 @@ -507,9 +510,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); |