diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-05 21:49:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-05 21:49:08 +0100 |
| commit | 214aecac78c5efa499591937241e13b45d2b9e05 (patch) | |
| tree | c8b4c3d98cd8d35bf25c3f6995af991bf455f0c5 /lib | |
| parent | e2d739fa21817c8442304e69a3fd70454def0aa7 (diff) | |
| download | nextcloud-server-214aecac78c5efa499591937241e13b45d2b9e05.tar.gz nextcloud-server-214aecac78c5efa499591937241e13b45d2b9e05.zip | |
require composer's autoload.php if present
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index d3e483f4948..cf1ffc01771 100644 --- a/lib/base.php +++ b/lib/base.php @@ -410,8 +410,6 @@ class OC { self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib'); self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); - self::$loader->registerPrefix('Sabre\\VObject', '3rdparty'); - self::$loader->registerPrefix('Sabre_', '3rdparty'); self::$loader->registerPrefix('Patchwork', '3rdparty'); spl_autoload_register(array(self::$loader, 'load')); @@ -479,6 +477,12 @@ class OC { } OC_Util::isSetLocaleWorking(); + // setup 3rdparty autoloader + $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php'; + if (@file_exists($vendorAutoLoad)) { + require_once $vendorAutoLoad; + } + // set debug mode if an xdebug session is active if (!defined('DEBUG') || !DEBUG) { if (isset($_COOKIE['XDEBUG_SESSION'])) { |