re: r66438 Fix doc string, add usermessage-editor to $wgReservedUsernames

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5b7ef48..f17ec90 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3851,6 +3851,7 @@ $wgReservedUsernames = array(
        'Maintenance script', // Maintenance scripts which perform editing, image import script
        'Template namespace initialisation script', // Used in 1.2->1.3 upgrade
        'msg:double-redirect-fixer', // Automatic double redirect fix
+       'msg:usermessage-editor', // Default user for leaving user messages
 );
 
 /**

diff --git a/includes/User.php b/includes/User.php
index cd1ae37..1853cb1 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3757,7 +3757,7 @@ class User {
         * @param $article Article The article to update, defaults to the
         *                        user's talk page.
         * @param $editor User The user leaving the message, defaults to
-        *                        "SystemMessage"
+        *                        "{{MediaWiki:usermessage-editor}}"
         * @param $flags Int default edit flags
         *
         * @return boolean true if it was successful