From f2aa2c6980460261f27bf01d3e074aa9b2d4bd5d Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 18 Jun 2010 20:28:22 +0000 Subject: Merging r6497:6499 to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@6514 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/lib/users.php') diff --git a/engine/lib/users.php b/engine/lib/users.php index fcc10133f..99ef15246 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1435,10 +1435,10 @@ function validate_username($username) { } // Belts and braces TODO: Tidy into main unicode - $blacklist2 = '/\\"\'*& ?#%^(){}[]~?<>;|¬`@-+='; + $blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@-+='; for ($n=0; $n < strlen($blacklist2); $n++) { if (strpos($username, $blacklist2[$n])!==false) { - throw new RegistrationException(elgg_echo('registration:invalidchars')); + throw new RegistrationException(sprintf(elgg_echo('registration:invalidchars'), $blacklist2[$n], $blacklist2)); } } -- cgit v1.2.3