Use composer autoloader to load Patchwork

diff --git a/3rdparty b/3rdparty
index 94179d9d70b6be43ff4251941034cd2735d10f4e..f4b9191a5f825a4285bff4b8478537a20997534c 160000 (submodule)
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 94179d9d70b6be43ff4251941034cd2735d10f4e
+Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c

diff --git a/lib/base.php b/lib/base.php
index 50e415c334cc2b78ae6e34cf2167dc5c678d58d5..3d374f12f7d7d356c8934fadd3bb228f2659c2fd 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -461,7 +461,6 @@ class OC {
                        $loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
                        $loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
                        $loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
-                       $loader->add('Patchwork',OC::$THIRDPARTYROOT . '/3rdparty');
                } else {
                        OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
                        OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
@@ -525,7 +524,6 @@ class OC {
                stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
                stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
-
                \OC::$server->getEventLogger()->start('init_session', 'Initialize session');
                self::initTemplateEngine();
                OC_App::loadApps(array('session'));