Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions includes/common.php
Expand Up @@ -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));
}

Expand Down
5 changes: 5 additions & 0 deletions includes/init.php
Expand Up @@ -135,6 +135,11 @@
$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();
Expand Down