Index: branches/dev/data/module/MDB2.php
===================================================================
--- branches/dev/data/module/MDB2.php	(revision 15971)
+++ branches/dev/data/module/MDB2.php	(revision 15975)
@@ -929,5 +929,5 @@
         if (!@ini_get('safe_mode')) {
              $dirs = explode(PATH_SEPARATOR, ini_get('include_path'));
-             $dirs[] = DATA_PATH . "module/";
+             //$dirs[] = DATA_PATH . "module/";
              
              foreach ($dirs as $dir) {
@@ -1859,6 +1859,6 @@
             }
             
-            if ($phptype_specific === false
-                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name))
+            if ($module != "Datatype" && ($phptype_specific === false
+                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name)))
             ) {
                 $version = false;
