Fixing a recent change to get_list_of_plugins that was causing

auth/db to be invisible    bug 1245

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 6a241735233c61a0dccb5735ea379a21388ac726..339ebb49c82699c591a5a75dc92701e228745a0a 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -413,7 +413,7 @@ function upgrade_blocks_plugins($continueto) {
 
     $site = get_site();
 
-    if (!$blocks = get_list_of_plugins("blocks") ) {
+    if (!$blocks = get_list_of_plugins("blocks", "db") ) {
         error("No blocks installed!");
     }
 

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 97925b629e337f294d448f2222d9fdedb1929f4c..d3815b22a06f3beb0b291d2c10706c29ca21b2b5 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1997,7 +1997,7 @@ function delete_event($id) {
 
 /// ENVIRONMENT CHECKING  ////////////////////////////////////////////////////////////
 
-function get_list_of_plugins($plugin="mod") {
+function get_list_of_plugins($plugin="mod", $exclude="") {
 /// Lists plugin directories within some directory
 
     global $CFG;
@@ -2005,7 +2005,7 @@ function get_list_of_plugins($plugin="mod") {
     $basedir = opendir("$CFG->dirroot/$plugin");
     while ($dir = readdir($basedir)) {
         $firstchar = substr($dir, 0, 1);
-        if ($firstchar == "." or $dir == "CVS" or $dir == "_vti_cnf" or $dir == "db") {
+        if ($firstchar == "." or $dir == "CVS" or $dir == "_vti_cnf" or $dir == $exclude) {
             continue;
         }
         if (filetype("$CFG->dirroot/$plugin/$dir") != "dir") {