diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-29 11:34:23 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-29 11:34:23 +0100 |
commit | c353cbe63306aecda572557bc09f30cfe7704c47 (patch) | |
tree | 918d2bc8a803e4ffc6b8a34d31053aba68d82686 | |
parent | cb944814d9be6e7b7bcff6e41e25a34ecc36fa40 (diff) | |
parent | 46c2909c785267fc1c71cf2aa635d467ab2cded5 (diff) | |
download | nextcloud-server-c353cbe63306aecda572557bc09f30cfe7704c47.tar.gz nextcloud-server-c353cbe63306aecda572557bc09f30cfe7704c47.zip |
Merge pull request #11689 from owncloud/doctrine-2.5
Update doctrine/dbal to 2.5
m--------- | 3rdparty | 0 | ||||
-rw-r--r-- | lib/base.php | 2 |
2 files changed, 0 insertions, 2 deletions
diff --git a/3rdparty b/3rdparty -Subproject f4b9191a5f825a4285bff4b8478537a20997534 +Subproject e726a92d4af699fcb1085d7219dcfbbbb953da8 diff --git a/lib/base.php b/lib/base.php index 3d374f12f7d..049f4216ee1 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 { |