From 59706194bf3b0db2c624014e3168ef2c739aac4f Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Wed, 25 Jan 2017 14:56:59 -0600 Subject: [PATCH] refactor: move HTMLPurifier init to init.php so we only create one object. (#5601) --- includes/common.php | 6 ++---- includes/init.php | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/includes/common.php b/includes/common.php index 484df8d96b..b074218cd4 100644 --- a/includes/common.php +++ b/includes/common.php @@ -1503,10 +1503,8 @@ function clean($value) */ function display($value) { - global $config; - $p_config = HTMLPurifier_Config::createDefault(); - $p_config->set('Cache.SerializerPath', $config['temp_dir']); - $purifier = new HTMLPurifier($p_config); + /** @var HTMLPurifier $purifier */ + global $purifier; return $purifier->purify(stripslashes($value)); } diff --git a/includes/init.php b/includes/init.php index 8df327028c..3ae3cc1ea5 100644 --- a/includes/init.php +++ b/includes/init.php @@ -135,6 +135,11 @@ 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();