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

Merge pull request #11921 from owncloud/symfony-composer 

Symfony composer
This commit is contained in:
Lukas Reschke 2014-11-03 16:42:52 +01:00
parent 13b18aafcc 136b0c22c9
commit f8f38b06df
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3d Subproject commit c37dc06ce2906813dec3296d1a58c1628c206a31

1
core/command/upgrade.php
View File

@ -34,6 +34,7 @@ class Upgrade extends Command {
* @param IConfig $config * @param IConfig $config
*/ */
public function __construct(IConfig $config) { public function __construct(IConfig $config) {
parent::__construct();
$this->config = $config; $this->config = $config;
} }

2
lib/base.php
View File

@ -459,8 +459,6 @@ class OC {
if (file_exists($vendorAutoLoad)) { if (file_exists($vendorAutoLoad)) {
$loader = require_once $vendorAutoLoad; $loader = require_once $vendorAutoLoad;
$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple'); $loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
} 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.');