Merge pull request #11689 from owncloud/doctrine-2.5

Update doctrine/dbal to 2.5
remotes/origin/fix-10825
Thomas Müller 12 years ago
commit c353cbe633
  1. 2
      3rdparty
  2. 2
      lib/base.php

@ -1 +1 @@
Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c
Subproject commit e726a92d4af699fcb1085d7219dcfbbbb953da83

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

Loading…
Cancel
Save