refactor: move HTMLPurifier init to init.php so we only create one object. (#5601)

This commit is contained in:
Tony Murray
2017-01-25 14:56:59 -06:00
committed by Neil Lathwood
parent 7bae2cf0a7
commit 59706194bf
2 changed files with 7 additions and 4 deletions

View File

@ -1503,10 +1503,8 @@ function clean($value)
*/ */
function display($value) function display($value)
{ {
global $config; /** @var HTMLPurifier $purifier */
$p_config = HTMLPurifier_Config::createDefault(); global $purifier;
$p_config->set('Cache.SerializerPath', $config['temp_dir']);
$purifier = new HTMLPurifier($p_config);
return $purifier->purify(stripslashes($value)); return $purifier->purify(stripslashes($value));
} }

View File

@ -135,6 +135,11 @@ if (module_selected('web', $init_modules)) {
$os_list[] = $config['install_dir'].'/includes/definitions/'. $v['os'] . '.yaml'; $os_list[] = $config['install_dir'].'/includes/definitions/'. $v['os'] . '.yaml';
} }
load_all_os($os_list); 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(); $console_color = new Console_Color2();