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

MDL-62838 filters: dont use statics inside functions. Use MUC

Browse Source
This commit is contained in:
Tim Hunt
2018-06-29 17:25:13 +01:00
parent 543005a342
commit ed3468e40b
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filterlib.php
+13 -8
View File
@@ -692,16 +692,21 @@ function filter_is_enabled($filtername) {
* @return array where the keys and values are both the filter name, like 'tex'.
*/
function filter_get_globally_enabled() {
static $enabledfilters = null;
if (is_null($enabledfilters)) {
$filters = filter_get_global_states();
$enabledfilters = array();
foreach ($filters as $filter => $filerinfo) {
if ($filerinfo->active != TEXTFILTER_DISABLED) {
$enabledfilters[$filter] = $filter;
}
$cache = \cache::make_from_params(\cache_store::MODE_REQUEST, 'core_filter', 'global_filters');
$enabledfilters = $cache->get('enabled');
if ($enabledfilters !== false) {
return $enabledfilters;
}
$filters = filter_get_global_states();
$enabledfilters = array();
foreach ($filters as $filter => $filerinfo) {
if ($filerinfo->active != TEXTFILTER_DISABLED) {
$enabledfilters[$filter] = $filter;
}
}
$cache->set('enabled', $enabledfilters);
return $enabledfilters;
}