Change to use 3rdparty version

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index ffcaaf9..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "3rdparty/doctrine-common"]
-       path = 3rdparty/doctrine-common
-       url = git://github.com/doctrine/common.git
-[submodule "3rdparty/doctrine-dbal"]
-       path = 3rdparty/doctrine-dbal
-       url = git://github.com/doctrine/dbal.git

diff --git a/3rdparty/doctrine-common b/3rdparty/doctrine-common
deleted file mode 160000 (submodule)
index d1c7d43..0000000
--- a/3rdparty/doctrine-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2

diff --git a/3rdparty/doctrine-dbal b/3rdparty/doctrine-dbal
deleted file mode 160000 (submodule)
index 30dc433..0000000
--- a/3rdparty/doctrine-dbal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 30dc433ea08f4863479700492bdb70c3b06440bd

diff --git a/lib/base.php b/lib/base.php
index d9a0e2c757f971562ff6bfa1eaf2fd2696cee4a2..7acad72f02a39a6a1699a1a311346989b338976f 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -100,10 +100,10 @@ class OC{
                        $path =  str_replace('_', '/', $className) . '.php';
                }
                elseif(strpos($className, 'Doctrine\\Common')===0) {
-                       $path = 'doctrine-common/lib/'.str_replace('\\', '/', $className) . '.php';
+                       $path = 'doctrine/common/lib/'.str_replace('\\', '/', $className) . '.php';
                }
                elseif(strpos($className, 'Doctrine\\DBAL')===0) {
-                       $path = 'doctrine-dbal/lib/'.str_replace('\\', '/', $className) . '.php';
+                       $path = 'doctrine/dbal/lib/'.str_replace('\\', '/', $className) . '.php';
                }
                elseif(strpos($className, 'Symfony\\Component\\Routing\\')===0) {
                        $path = 'symfony/routing/'.str_replace('\\', '/', $className) . '.php';