moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-09-05 18:06:40 +02:00
commit f30c075d69
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/classes/plugininfo/filter.php
View file

@ -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;
}