mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11738 from owncloud/update-patchwork-utf8 

Use composer autoloader to load Patchwork
This commit is contained in:
Morris Jobke 2014-10-28 14:40:16 +01:00
parent c864f5e20c c93ddf77b9
commit dd9cd7c946
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 94179d9d70b6be43ff4251941034cd2735d10f4e Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c

2
lib/base.php
View File

@ -461,7 +461,6 @@ class OC {
$loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib'); $loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing'); $loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console'); $loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
$loader->add('Patchwork',OC::$THIRDPARTYROOT . '/3rdparty');
} else { } else {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printErrorPage('Composer autoloader not found, unable to continue.'); 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('quota', 'OC\Files\Stream\Quota');
stream_wrapper_register('oc', 'OC\Files\Stream\OC'); stream_wrapper_register('oc', 'OC\Files\Stream\OC');
\OC::$server->getEventLogger()->start('init_session', 'Initialize session'); \OC::$server->getEventLogger()->start('init_session', 'Initialize session');
self::initTemplateEngine(); self::initTemplateEngine();
OC_App::loadApps(array('session')); OC_App::loadApps(array('session'));