MDL-22054 skip loading of missing modules

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 3c97d2e..d28af5d 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -11,6 +11,9 @@ if ($hassiteconfig) {
         $modulebyname = array();
 
         foreach ($modules as $module) {
+            if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
+                continue;
+            }
             $strmodulename = get_string('modulename', $module->name);
             // Deal with modules which are lacking the language string
             if ($strmodulename == '[[modulename]]') {

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index bd8d343..f04aad3 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2825,6 +2825,10 @@ function &get_fast_modinfo(&$course, $userid=0) {
                 $minimalmodinfo=new stdClass();
                 $minimalmodinfo->cms=array();
                 foreach($info as $mod) {
+                    if (empty($mod->name)) {
+                        // something is wrong here
+                        continue;
+                    }
                     $minimalcm = new stdClass();
                     $minimalcm->id = $mod->cm;
                     $minimalcm->name = $mod->name;