summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-01 12:49:38 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-01 12:49:38 +0000
commitcf02e7c01e0f1dcc57e4e3033d922a56cb16a50d (patch)
tree8d8a343f55506186022f1280bf4b1b744e3f51a4
parent#12271 (diff)
downloadphpbb-cf02e7c01e0f1dcc57e4e3033d922a56cb16a50d.tar.gz
phpbb-cf02e7c01e0f1dcc57e4e3033d922a56cb16a50d.tar.bz2
phpbb-cf02e7c01e0f1dcc57e4e3033d922a56cb16a50d.zip
disallow yet another character (there are more, of course - but we do not add every character)
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@8361 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_validate.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 668671d4da..cf95563a89 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -79,6 +79,7 @@ p,ul,td {font-size:10pt;}
<li>[Fix] Fixed html output in make_forum_select if no forums present (Bug #436)</li>
<li>[Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)</li>
<li>[Fix] Correctly display censored words in admin panel (Bug #12271)</li>
+<li>[Fix] Do not allow soft hyphen \xAD in usernames (reported by Bander00)</li>
</ul>
<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php
index 42bf2e80bb..fdb4ab1788 100644
--- a/phpBB/includes/functions_validate.php
+++ b/phpBB/includes/functions_validate.php
@@ -101,7 +101,7 @@ function validate_username($username)
$db->sql_freeresult($result);
// Don't allow " and ALT-255 in username.
- if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)))
+ if (strstr($username, '"') || strstr($username, '&quot;') || strstr($username, chr(160)) || strstr($username, chr(173)))
{
return array('error' => true, 'error_msg' => $lang['Username_invalid']);
}