From 56a1db7d7bf836df60975661940ff4fbe2cec6cd Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 21 Oct 2007 18:48:51 +0000 Subject: - Allow charset names containing underscores or spaces git-svn-id: file:///svn/phpbb/trunk@8214 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/utf/utf_tools.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b691f19015..e75ccb5f42 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -94,6 +94,7 @@
  • [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)
  • [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)
  • [Fix] Correctly count announcements when filtering forums by date (Bug #14877)
    • +
  • [Fix] Allow charset names containing underscores or spaces

    • 1.ii. Changes since 3.0.RC6

    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); -- cgit v1.2.1