From c93ddf77b9e75b9e38764ad4360d82600eae3096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 23 Oct 2014 15:28:26 +0200
Subject: [PATCH] Use composer autoloader to load Patchwork
---
3rdparty | 2 +-
lib/base.php | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/3rdparty b/3rdparty
index 94179d9d70b..f4b9191a5f8 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 94179d9d70b6be43ff4251941034cd2735d10f4e
+Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c
diff --git a/lib/base.php b/lib/base.php
index 50e415c334c..3d374f12f7d 100644
--- 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'));
--
GitLab