diff --git a/course/resources.php b/course/resources.php
index 6debe853d08..7a1c2e82c19 100644
--- a/course/resources.php
+++ b/course/resources.php
@@ -84,7 +84,11 @@ foreach ($modinfo->cms as $cm) {
// preload instances
foreach ($resources as $modname=>$instances) {
- $resources[$modname] = $DB->get_records_list($modname, 'id', $instances, 'id', 'id,name,intro,introformat,timemodified');
+ $additionalfields = '';
+ if (plugin_supports('mod', $modname, FEATURE_MOD_INTRO)) {
+ $additionalfields = ',intro,introformat';
+ }
+ $resources[$modname] = $DB->get_records_list($modname, 'id', $instances, 'id', 'id,name'.$additionalfields);
}
if (!$cms) {
@@ -109,8 +113,8 @@ foreach ($cms as $cm) {
continue;
}
$resource = $resources[$cm->modname][$cm->instance];
+ $printsection = '';
if ($usesections) {
- $printsection = '';
if ($cm->sectionnum !== $currentsection) {
if ($cm->sectionnum) {
$printsection = get_section_name($course, $cm->sectionnum);
@@ -120,8 +124,6 @@ foreach ($cms as $cm) {
}
$currentsection = $cm->sectionnum;
}
- } else {
- $printsection = ''.userdate($resource->timemodified)."";
}
$extra = empty($cm->extra) ? '' : $cm->extra;
@@ -131,11 +133,17 @@ foreach ($cms as $cm) {
$icon = '
';
}
+ if (isset($cm->intro) && isset($cm->introformat)) {
+ $intro = format_module_intro('resource', $resource, $cm->id);
+ } else {
+ $intro = '';
+ }
+
$class = $cm->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed
$table->data[] = array (
$printsection,
"wwwroot/mod/$cm->modname/view.php?id=$cm->id\">".$icon.format_string($resource->name)."",
- format_module_intro('resource', $resource, $cm->id));
+ $intro);
}
echo html_writer::table($table);