From adf774f0b1881a18b751c73a0efad948e8d68505 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 29 Sep 2018 02:01:55 +0100 Subject: [PATCH] user: Remove use of Message:text() from User::isUsableName() None of the current translations use of "&", "{" or "[", which presumably means they don't require tranformation. I'd also very much prefer such dynamic constructs not be added into this system which would make it rather unpredictable given these reserved usernames shouldn't change from time to time. The only match for the below command is qqq.json, > $ git grep -E '"(double-redirect-fixer|usermessage-editor|\ > proxyblocker|sorbs|spambot.username|autochange-username)"\ > ' | grep -E '[{&[]' This code was originally introduced with r37928 (5ad5cb4f0a64), which used wfMsgForContent() and made no explicit mention of transformation, it just happened to be the default. Later, when that function was deprecated, it got batch-replaced by ->inContentLanguage()->text(). Bug: T189966 Change-Id: Ia4ddf215e83f15de552f8311b9e737559c72b49a --- includes/user/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/user/User.php b/includes/user/User.php index aaa7663948..c9fe959628 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -1051,7 +1051,7 @@ class User implements IDBAccessObject, UserIdentity { // Certain names may be reserved for batch processes. foreach ( $reservedUsernames as $reserved ) { if ( substr( $reserved, 0, 4 ) == 'msg:' ) { - $reserved = wfMessage( substr( $reserved, 4 ) )->inContentLanguage()->text(); + $reserved = wfMessage( substr( $reserved, 4 ) )->inContentLanguage()->plain(); } if ( $reserved == $name ) { return false; -- 2.20.1