Index: adminlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v
retrieving revision 1.359
diff -u -r1.359 adminlib.php
--- adminlib.php	29 May 2009 07:56:52 -0000	1.359
+++ adminlib.php	29 May 2009 10:03:57 -0000
@@ -244,65 +244,12 @@
 /// First, the main one (lib/db)
     $dbdirs[] = $CFG->libdir.'/db';
 
-/// Now, activity modules (mod/xxx/db)
-    if ($plugins = get_list_of_plugins('mod')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/mod/'.$plugin.'/db';
-        }
-    }
-
-/// Now, assignment submodules (mod/assignment/type/xxx/db)
-    if ($plugins = get_list_of_plugins('mod/assignment/type')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/mod/assignment/type/'.$plugin.'/db';
-        }
-    }
-
-/// Now, question types (question/type/xxx/db)
-    if ($plugins = get_list_of_plugins('question/type')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/question/type/'.$plugin.'/db';
-        }
-    }
-
-/// Now, blocks (blocks/xxx/db)
-    if ($plugins = get_list_of_plugins('blocks', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/blocks/'.$plugin.'/db';
-        }
-    }
-
-/// Now, course formats (course/format/xxx/db)
-    if ($plugins = get_list_of_plugins('course/format', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/course/format/'.$plugin.'/db';
-        }
-    }
-
-/// Now, enrolment plugins (enrol/xxx/db)
-    if ($plugins = get_list_of_plugins('enrol', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/enrol/'.$plugin.'/db';
-        }
-    }
-
-/// Now admin report plugins (admin/report/xxx/db)
-    if ($plugins = get_list_of_plugins($CFG->admin.'/report', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/'.$CFG->admin.'/report/'.$plugin.'/db';
-        }
-    }
-
-/// Now quiz report plugins (mod/quiz/report/xxx/db)
-    if ($plugins = get_list_of_plugins('mod/quiz/report', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot.'/mod/quiz/report/'.$plugin.'/db';
-        }
-    }
-
-    if ($plugins = get_list_of_plugins('portfolio/type', 'db')) {
-        foreach ($plugins as $plugin) {
-            $dbdirs[] = $CFG->dirroot . '/portfolio/type/' . $plugin . '/db';
+/// Next, all plugins
+    foreach(get_plugin_types() as $type => $location) {
+        if ($plugins = get_list_of_plugins($type)) {
+            foreach ($plugins as $plugin) {
+                $dbdirs[] = $CFG->dirroot."/$location/$plugin/db";
+            }
         }
     }