From 1ef57be80aabbeb3ec6f2a02862a32aaf4f231fc Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 10 May 2014 10:41:30 +0200 Subject: [PATCH] Fix title handling in User::getCanonicalName With r41328 the title validation was changed to allow rename of invalid user names, by always creating a title object. That removes the title validation for validation of 'usable' and 'creatable', but in that case it is also a good idea to apply title rules to normalize spaces and reject user names which can not have a valid title. At the moment that is done in User::isValidUserName. Change-Id: I27c488e4008a924117ff6bac2216f148cd5e7abd --- includes/User.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/User.php b/includes/User.php index fa20ebdaa6..af5bc3dc78 100644 --- a/includes/User.php +++ b/includes/User.php @@ -918,8 +918,9 @@ class User implements IDBAccessObject { return false; } - // Clean up name according to title rules - $t = ( $validate === 'valid' ) ? + // Clean up name according to title rules, + // but only when validation is requested (bug 12654) + $t = ( $validate !== false ) ? Title::newFromText( $name ) : Title::makeTitle( NS_USER, $name ); // Check for invalid titles if ( is_null( $t ) ) { -- 2.20.1