Index: branches/dev/data/module/MDB2.php
===================================================================
--- branches/dev/data/module/MDB2.php	(revision 15976)
+++ branches/dev/data/module/MDB2.php	(revision 15977)
@@ -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) {
@@ -1858,15 +1858,7 @@
                 $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
             }
-            /*
-            if ($module != "Datatype" && ($phptype_specific === false
-                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name)))
-            ) {
-                $version = false;
-                $class_name = 'MDB2_'.$module;
-                $file_name = str_replace('_', DIRECTORY_SEPARATOR, $class_name).'.php';
-            }
-            */
-            if ( ($phptype_specific === false
-                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name)))
+            
+            if ($phptype_specific === false
+                || (!MDB2::classExists($class_name) && !MDB2::fileExists($file_name))
             ) {
                 $version = false;