From 18703b71acaa4409305f584b91acfbafeb1149b9 Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Fri, 10 Feb 2023 18:42:47 +0800 Subject: [PATCH] MDL-77105 block_recentlyaccesseditems: Add 'nofilter' class Add the `.nofilter` class for activity icons when the icon URL's `filtericon` parameter is not set, so they get rendered as they are on the recently accessed items block. --- .../external/recentlyaccesseditems_item_exporter.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/blocks/recentlyaccesseditems/classes/external/recentlyaccesseditems_item_exporter.php b/blocks/recentlyaccesseditems/classes/external/recentlyaccesseditems_item_exporter.php index bff39633dbc..549a2ec9d50 100644 --- a/blocks/recentlyaccesseditems/classes/external/recentlyaccesseditems_item_exporter.php +++ b/blocks/recentlyaccesseditems/classes/external/recentlyaccesseditems_item_exporter.php @@ -51,17 +51,18 @@ class recentlyaccesseditems_item_exporter extends \core\external\exporter { protected function get_other_values(renderer_base $output) { global $CFG; require_once($CFG->libdir.'/modinfolib.php'); - + $iconurl = get_fast_modinfo($this->data->courseid)->cms[$this->data->cmid]->get_icon_url(); + $iconclass = $iconurl->get_param('filtericon') ? '' : 'nofilter'; return array( 'viewurl' => (new moodle_url('/mod/'.$this->data->modname.'/view.php', array('id' => $this->data->cmid)))->out(false), 'courseviewurl' => (new moodle_url('/course/view.php', array('id' => $this->data->courseid)))->out(false), 'icon' => \html_writer::img( - get_fast_modinfo($this->data->courseid)->cms[$this->data->cmid]->get_icon_url(), + $iconurl, get_string('pluginname', $this->data->modname), - ['title' => get_string('pluginname', $this->data->modname), 'class' => 'icon'] + ['title' => get_string('pluginname', $this->data->modname), 'class' => "icon $iconclass"] ), - 'purpose' => plugin_supports('mod', $this->data->modname, FEATURE_MOD_PURPOSE, MOD_PURPOSE_OTHER) + 'purpose' => plugin_supports('mod', $this->data->modname, FEATURE_MOD_PURPOSE, MOD_PURPOSE_OTHER), ); }