From e5e2f39ed5a0a23bfd2aee59d3e91cd57cfa512f Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Tue, 23 Aug 2016 12:56:22 +0800 Subject: [PATCH] MDL-55663 filter: Filters could be incorrectly reported as inactive --- lib/classes/plugininfo/filter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/classes/plugininfo/filter.php b/lib/classes/plugininfo/filter.php index cb50ce80bb5..1921a96fc46 100644 --- a/lib/classes/plugininfo/filter.php +++ b/lib/classes/plugininfo/filter.php @@ -49,7 +49,8 @@ class filter extends base { require_once("$CFG->libdir/filterlib.php"); $enabled = array(); - $filters = $DB->get_records_select('filter_active', "active <> :disabled", array('disabled'=>TEXTFILTER_DISABLED), 'filter ASC', 'id, filter'); + $filters = $DB->get_records_select('filter_active', "active <> :disabled AND contextid = :contextid", array( + 'disabled' => TEXTFILTER_DISABLED, 'contextid' => \context_system::instance()->id), 'filter ASC', 'id, filter'); foreach ($filters as $filter) { $enabled[$filter->filter] = $filter->filter; }