From fc61cecd6a1e06f5e9ca685caacdf1f300aa48ff Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 11 Apr 2010 08:59:27 +0000 Subject: [PATCH] MDL-22054 skip loading of missing modules --- admin/settings/plugins.php | 3 +++ lib/moodlelib.php | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php index 3c97d2e2de6..d28af5daff5 100644 --- 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 bd8d3436a69..f04aad3b3b5 100644 --- 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; -- 2.17.1