From 46c2909c785267fc1c71cf2aa635d467ab2cded5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 21 Oct 2014 15:30:23 +0200
Subject: [PATCH] Update doctrine/dbal to 2.5
---
3rdparty | 2 +-
lib/base.php | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/3rdparty b/3rdparty
index f4b9191a5f..e726a92d4a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c
+Subproject commit e726a92d4af699fcb1085d7219dcfbbbb953da83
diff --git a/lib/base.php b/lib/base.php
index 3d374f12f7..049f4216ee 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,8 +457,6 @@ class OC {
if (file_exists($vendorAutoLoad)) {
$loader = require_once $vendorAutoLoad;
$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
- $loader->add('Doctrine\\Common',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/common/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\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
} else {
--
GitLab