L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2013-06-12 09:34:06 +12:00
parent 18a1f186db b8b50d04fe
commit 5d24aff39f
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filterlib.php
+7
View File
@@ -571,17 +571,22 @@ function filter_set_global_state($filtername, $state, $move = 0) {
if (isset($on[$filtername])) {
$filter = $on[$filtername];
if ($filter->active != $state) {
add_to_config_log('filter_active', $filter->active, $state, $filtername);
$filter->active = $state;
$DB->update_record('filter_active', $filter);
if ($filter->active == TEXTFILTER_DISABLED) {
unset($on[$filtername]);
$off = array($filter->filter => $filter) + $off;
}
}
} else if (isset($off[$filtername])) {
$filter = $off[$filtername];
if ($filter->active != $state) {
add_to_config_log('filter_active', $filter->active, $state, $filtername);
$filter->active = $state;
$DB->update_record('filter_active', $filter);
if ($filter->active != TEXTFILTER_DISABLED) {
@@ -591,6 +596,8 @@ function filter_set_global_state($filtername, $state, $move = 0) {
}
} else {
add_to_config_log('filter_active', '', $state, $filtername);
$filter = new stdClass();
$filter->filter = $filtername;
$filter->contextid = $syscontext->id;