Change to use 3rdparty version

4 files changed, 2 insertions, 8 deletions

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ffcaaf952ba..00000000000
--- 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
-Subproject d1c7d4334e38cad603a5c863d4c7b91bb04ec6b
diff --git a/3rdparty/doctrine-dbal b/3rdparty/doctrine-dbal
deleted file mode 160000
-Subproject 30dc433ea08f4863479700492bdb70c3b06440b
diff --git a/lib/base.php b/lib/base.php
index d9a0e2c757f..7acad72f02a 100644
--- 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';