diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 77971f7e68..e7f144af51 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -768,7 +768,7 @@ function utf8_recode($string, $encoding)  	}  	// If nothing works, check if we have a custom transcoder available -	if (!preg_match('#^[a-z0-9\\-]+$#', $encoding)) +	if (!preg_match('#^[a-z0-9_ \\-]+$#', $encoding))  	{  		// Make sure the encoding name is alphanumeric, we don't want it to be abused into loading arbitrary files  		trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR);  | 
