summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-05-02 14:10:53 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2016-05-02 14:10:53 +0200
commit866856035289196eb017446dec70ea45c234f0b1 (patch)
tree7b3c5e94fc59d585ac17f199347103f338b45623 /lib
parentd7eb17bdc023c6e31d24a0636e0f5cad58aa876f (diff)
downloadnextcloud-server-866856035289196eb017446dec70ea45c234f0b1.tar.gz
nextcloud-server-866856035289196eb017446dec70ea45c234f0b1.zip
Keep the composer instance so we can add psr4 paths later
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index fb58177a432..badbe3cd1f8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -103,6 +103,9 @@ class OC {
*/
public static $loader = null;
+ /** @var \Composer\Autoload\ClassLoader $composerAutoloader */
+ public static $composerAutoloader = null;
+
/**
* @var \OC\Server
*/
@@ -493,7 +496,7 @@ class OC {
self::$CLI = (php_sapi_name() == 'cli');
// Add default composer PSR-4 autoloader
- require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+ self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
try {
self::initPaths();