From 2f1095cb8db757205f8630e52eee1bd328520765 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Thu, 26 Jan 2017 13:23:03 -0600 Subject: [PATCH] fix: html purify init wasn't done always when it was used (#5626) --- includes/common.php | 9 ++++++++- includes/init.php | 5 ----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/common.php b/includes/common.php index b074218cd4..6475a78b16 100644 --- a/includes/common.php +++ b/includes/common.php @@ -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)); } diff --git a/includes/init.php b/includes/init.php index 3ae3cc1ea5..8df327028c 100644 --- a/includes/init.php +++ b/includes/init.php @@ -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();