require composer's autoload.php if present

diff --git a/lib/base.php b/lib/base.php
index d3e483f49485f01c5400edc385bc5f52c3952ccc..cf1ffc01771ee83da20c435a8aad7287a7627060 100644 (file)
--- 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'])) {