diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-03 16:42:52 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-03 16:42:52 +0100 |
| commit | f8f38b06dfef0af2555124cf0d1ec55402aa8c8c (patch) | |
| tree | c5e4a7d6e73e582ffd88c6836d1345f33b02be7b | |
| parent | 13b18aafccaa98137a390a64c094be77a98ba9ee (diff) | |
| parent | 136b0c22c929ebad933c433c1689977b916d1fe0 (diff) | |
| download | nextcloud-server-f8f38b06dfef0af2555124cf0d1ec55402aa8c8c.tar.gz nextcloud-server-f8f38b06dfef0af2555124cf0d1ec55402aa8c8c.zip | |
Merge pull request #11921 from owncloud/symfony-composer
Symfony composer
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | core/command/upgrade.php | 1 | ||||
| -rw-r--r-- | lib/base.php | 2 |
3 files changed, 1 insertions, 2 deletions
diff --git a/3rdparty b/3rdparty -Subproject 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3 +Subproject c37dc06ce2906813dec3296d1a58c1628c206a3 diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 5b9432d631b..aaeb63a3124 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -34,6 +34,7 @@ class Upgrade extends Command { * @param IConfig $config */ public function __construct(IConfig $config) { + parent::__construct(); $this->config = $config; } diff --git a/lib/base.php b/lib/base.php index 58695f31849..d428d45d90a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -459,8 +459,6 @@ class OC { if (file_exists($vendorAutoLoad)) { $loader = require_once $vendorAutoLoad; $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 { OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); OC_Template::printErrorPage('Composer autoloader not found, unable to continue.'); |