From a4f0483f56e7e77fe64ce34f56297c32793acad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 3 Nov 2014 13:52:47 +0100 Subject: [PATCH] Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 --- 3rdparty | 2 +- lib/base.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/3rdparty b/3rdparty index 7534a6a2b7..c37dc06ce2 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3d +Subproject commit c37dc06ce2906813dec3296d1a58c1628c206a31 diff --git a/lib/base.php b/lib/base.php index 58695f3184..d428d45d90 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.');