diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-10-28 14:40:16 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-10-28 14:40:16 +0100 |
| commit | dd9cd7c946fa81cc27d53e4726ed2bb1b86f9916 (patch) | |
| tree | f421e827bd95f16223e54dd9f0d296ff402694a6 | |
| parent | c864f5e20c5ecd1bca55c6ac26c7a5d0721e85e9 (diff) | |
| parent | c93ddf77b9e75b9e38764ad4360d82600eae3096 (diff) | |
| download | nextcloud-server-dd9cd7c946fa81cc27d53e4726ed2bb1b86f9916.tar.gz nextcloud-server-dd9cd7c946fa81cc27d53e4726ed2bb1b86f9916.zip | |
Merge pull request #11738 from owncloud/update-patchwork-utf8
Use composer autoloader to load Patchwork
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/base.php | 2 |
2 files changed, 0 insertions, 2 deletions
diff --git a/3rdparty b/3rdparty -Subproject 94179d9d70b6be43ff4251941034cd2735d10f4 +Subproject f4b9191a5f825a4285bff4b8478537a20997534 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')); |