upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #11689 from owncloud/doctrine-2.5

Browse source 
Update doctrine/dbal to 2.5
This commit is contained in:
Thomas Müller 2014-10-29 11:34:23 +01:00
commit c353cbe633
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 f4b9191a5f825a4285bff4b8478537a20997534c
Subproject commit e726a92d4af699fcb1085d7219dcfbbbb953da83

2
lib/base.php
View file

@ -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 {