clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: html purify init wasn't done always when it was used (#5626)

Browse Source
This commit is contained in:
Tony Murray 2017-01-26 13:23:03 -06:00 committed by Neil Lathwood
parent 08edfc60e0
commit 2f1095cb8d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/common.php
View File

@ -1504,7 +1504,14 @@ function clean($value)
function display($value)
{
/** @var HTMLPurifier $purifier */
global $purifier;
global $config, $purifier;
if (!isset($purifier)) {
// initialize HTML Purifier here since this is the only user
$p_config = HTMLPurifier_Config::createDefault();
$p_config->set('Cache.SerializerPath', $config['temp_dir']);
$purifier = new HTMLPurifier($p_config);
}
return $purifier->purify(stripslashes($value));
}

5
includes/init.php
View File

@ -135,11 +135,6 @@ if (module_selected('web', $init_modules)) {
$os_list[] = $config['install_dir'].'/includes/definitions/'. $v['os'] . '.yaml';
}
load_all_os($os_list);
// initialize HTML Purifier
$p_config = HTMLPurifier_Config::createDefault();
$p_config->set('Cache.SerializerPath', $config['temp_dir']);
$purifier = new HTMLPurifier($p_config);
}
$console_color = new Console_Color2();