diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-10-21 18:48:51 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-10-21 18:48:51 +0000 |
| commit | 56a1db7d7bf836df60975661940ff4fbe2cec6cd (patch) | |
| tree | 11dee4281d848b63158b3710dc005dbbd7d009c2 /phpBB/includes | |
| parent | 04876bd33039127f8767c53554baef83536acf2b (diff) | |
| download | forums-56a1db7d7bf836df60975661940ff4fbe2cec6cd.tar forums-56a1db7d7bf836df60975661940ff4fbe2cec6cd.tar.gz forums-56a1db7d7bf836df60975661940ff4fbe2cec6cd.tar.bz2 forums-56a1db7d7bf836df60975661940ff4fbe2cec6cd.tar.xz forums-56a1db7d7bf836df60975661940ff4fbe2cec6cd.zip | |
- Allow charset names containing underscores or spaces
git-svn-id: file:///svn/phpbb/trunk@8214 89ea8834-ac86-4346-8a33-228a782c2dd0
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); |