From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- extensions/Renameuser/Renameuser.alias.php | 12 ++- extensions/Renameuser/Renameuser.hooks.php | 2 +- extensions/Renameuser/Renameuser.i18n.php | 35 --------- extensions/Renameuser/Renameuser.php | 64 ++++----------- extensions/Renameuser/RenameuserLogFormatter.php | 21 +++++ extensions/Renameuser/RenameuserSQL.php | 90 +++++++++++++++++++--- extensions/Renameuser/SpecialRenameuser.php | 4 + extensions/Renameuser/extension.json | 57 ++++++++++++++ extensions/Renameuser/i18n/ar.json | 4 +- extensions/Renameuser/i18n/bn.json | 7 +- extensions/Renameuser/i18n/crh-cyrl.json | 2 + extensions/Renameuser/i18n/crh-latn.json | 2 + extensions/Renameuser/i18n/eo.json | 5 +- extensions/Renameuser/i18n/fa.json | 5 +- extensions/Renameuser/i18n/fy.json | 5 +- extensions/Renameuser/i18n/he.json | 2 +- extensions/Renameuser/i18n/hr.json | 4 +- extensions/Renameuser/i18n/kk-cyrl.json | 31 ++++++-- extensions/Renameuser/i18n/krc.json | 3 +- extensions/Renameuser/i18n/ksh.json | 4 +- extensions/Renameuser/i18n/lrc.json | 17 ++++ extensions/Renameuser/i18n/ps.json | 1 + extensions/Renameuser/i18n/qqq.json | 2 +- extensions/Renameuser/i18n/ru.json | 2 +- extensions/Renameuser/i18n/sr-ec.json | 4 +- extensions/Renameuser/i18n/sr-el.json | 5 +- extensions/Renameuser/i18n/uz.json | 4 +- extensions/Renameuser/i18n/zh-hant.json | 11 +-- .../Renameuser/specials/SpecialRenameuser.php | 33 ++++---- 29 files changed, 288 insertions(+), 150 deletions(-) delete mode 100644 extensions/Renameuser/Renameuser.i18n.php create mode 100644 extensions/Renameuser/extension.json (limited to 'extensions/Renameuser') diff --git a/extensions/Renameuser/Renameuser.alias.php b/extensions/Renameuser/Renameuser.alias.php index a296e30c..07790bbc 100644 --- a/extensions/Renameuser/Renameuser.alias.php +++ b/extensions/Renameuser/Renameuser.alias.php @@ -29,6 +29,11 @@ $specialPageAliases['as'] = array( 'Renameuser' => array( 'সদস্য_পুনৰ্নামকৰণ' ), ); +/** Avaric (авар) */ +$specialPageAliases['av'] = array( + 'Renameuser' => array( 'Переименовать_участника' ), +); + /** Bashkir (башҡортса) */ $specialPageAliases['ba'] = array( 'Renameuser' => array( 'RenameUser' ), @@ -354,6 +359,11 @@ $specialPageAliases['vi'] = array( 'Renameuser' => array( 'Đổi_tên_thành_viên', 'Đổi_tên_người_dùng' ), ); +/** Chinese (中文) */ +$specialPageAliases['zh'] = array( + 'Renameuser' => array( '重命名用户', '重新命名用户', '重新命名用戶', '重新命名使用者' ), +); + /** Simplified Chinese (中文（简体）‎) */ $specialPageAliases['zh-hans'] = array( 'Renameuser' => array( '重命名用户' ), @@ -361,5 +371,5 @@ $specialPageAliases['zh-hans'] = array( /** Traditional Chinese (中文（繁體）‎) */ $specialPageAliases['zh-hant'] = array( - 'Renameuser' => array( '重命名使用者' ), + 'Renameuser' => array( '重新命名使用者' ), ); \ No newline at end of file diff --git a/extensions/Renameuser/Renameuser.hooks.php b/extensions/Renameuser/Renameuser.hooks.php index e5271735..846f9131 100644 --- a/extensions/Renameuser/Renameuser.hooks.php +++ b/extensions/Renameuser/Renameuser.hooks.php @@ -46,7 +46,7 @@ class RenameuserHooks { if ( $wgUser->isAllowed( 'renameuser' ) && $id ) { $tools[] = Linker::link( SpecialPage::getTitleFor( 'Renameuser' ), - wfMessage( 'renameuser-linkoncontribs' )->text(), + wfMessage( 'renameuser-linkoncontribs' )->escaped(), array( 'title' => wfMessage( 'renameuser-linkoncontribs-text' )->parse() ), array( 'oldusername' => $nt->getText() ) ); diff --git a/extensions/Renameuser/Renameuser.i18n.php b/extensions/Renameuser/Renameuser.i18n.php deleted file mode 100644 index 009a1cda..00000000 --- a/extensions/Renameuser/Renameuser.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ - -$wgAvailableRights[] = 'renameuser'; -$wgGroupPermissions['bureaucrat']['renameuser'] = true; - -$wgExtensionCredits['specialpage'][] = array( - 'path' => __FILE__, - 'name' => 'Renameuser', - 'author' => array( 'Ævar Arnfjörð Bjarmason', 'Aaron Schulz' ), - 'url' => 'https://www.mediawiki.org/wiki/Extension:Renameuser', - 'descriptionmsg' => 'renameuser-desc', -); - -# Internationalisation files -$wgMessagesDirs['Renameuser'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['Renameuser'] = __DIR__ . '/Renameuser.i18n.php'; -$wgExtensionMessagesFiles['RenameuserAliases'] = __DIR__ . '/Renameuser.alias.php'; - -/** - * Users with more than this number of edits will have their rename operation - * deferred via the job queue. - */ -define( 'RENAMEUSER_CONTRIBJOB', 5000 ); - -# Add a new log type -$wgLogTypes[] = 'renameuser'; -$wgLogActionsHandlers['renameuser/renameuser'] = 'RenameuserLogFormatter'; - -$wgAutoloadClasses['RenameuserHooks'] = __DIR__ . '/Renameuser.hooks.php'; -$wgAutoloadClasses['RenameUserJob'] = __DIR__ . '/RenameUserJob.php'; -$wgAutoloadClasses['RenameuserLogFormatter'] = __DIR__ . '/RenameuserLogFormatter.php'; -$wgAutoloadClasses['RenameuserSQL'] = __DIR__ . '/RenameuserSQL.php'; -$wgAutoloadClasses['SpecialRenameuser'] = __DIR__ . '/specials/SpecialRenameuser.php'; - -$wgSpecialPages['Renameuser'] = 'SpecialRenameuser'; -$wgSpecialPageGroups['Renameuser'] = 'users'; -$wgJobClasses['renameUser'] = 'RenameUserJob'; - -$wgHooks['ShowMissingArticle'][] = 'RenameuserHooks::onShowMissingArticle'; -$wgHooks['ContributionsToolLinks'][] = 'RenameuserHooks::onContributionsToolLinks'; -$wgHooks['GetLogTypesOnUser'][] = 'RenameuserHooks::onGetLogTypesOnUser'; +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'Renameuser' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['Renameuser'] = __DIR__ . '/i18n'; + $wgExtensionMessagesFiles['RenameuserAliases'] = __DIR__ . '/Renameuser.alias.php'; + /* wfWarn( + 'Deprecated PHP entry point used for Renameuser extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return true; +} else { + die( 'This version of the Renameuser extension requires MediaWiki 1.25+' ); +} diff --git a/extensions/Renameuser/RenameuserLogFormatter.php b/extensions/Renameuser/RenameuserLogFormatter.php index c7c4678d..37078842 100644 --- a/extensions/Renameuser/RenameuserLogFormatter.php +++ b/extensions/Renameuser/RenameuserLogFormatter.php @@ -68,4 +68,25 @@ class RenameuserLogFormatter extends LogFormatter { return $key; } + + public function getPreloadTitles() { + $params = $this->extractParameters(); + if ( !isset( $params[3] ) ) { + // Very old log format, everything in comment - legaciest + return array(); + } + if ( !isset( $params[4] ) ) { + // Old log format - legacier + $newUserName = $params[3]; + } else { + $newUserName = $params[4]; + } + + $title = Title::makeTitleSafe( NS_USER, $newUserName ); + if ( $title ) { + return array( $title ); + } + + return array(); + } } diff --git a/extensions/Renameuser/RenameuserSQL.php b/extensions/Renameuser/RenameuserSQL.php index 77e4d8a0..dfdb403d 100644 --- a/extensions/Renameuser/RenameuserSQL.php +++ b/extensions/Renameuser/RenameuserSQL.php @@ -45,32 +45,69 @@ class RenameuserSQL { */ public $checkIfUserExists; + /** + * User object of the user performing the rename, for logging purposes + * + * @var User + */ + private $renamer; + + /** + * Reason to be used in the log entry + * + * @var string + */ + private $reason = ''; + + /** + * A prefix to use in all debug log messages + * + * @var string + */ + private $debugPrefix = ''; + + /** + * Users with more than this number of edits will have their rename operation + * deferred via the job queue. + */ + const CONTRIB_JOB = 500; + /** * Constructor * * @param $old string The old username * @param $new string The new username * @param $uid + * @param User $renamer * @param $options Array of options * 'checkIfUserExists' - bool, whether to update the user table */ - function __construct( $old, $new, $uid, $options = array() ) { + function __construct( $old, $new, $uid, User $renamer, $options = array() ) { $this->old = $old; $this->new = $new; $this->uid = $uid; + $this->renamer = $renamer; $this->checkIfUserExists = true; if ( isset ( $options['checkIfUserExists'] ) ) { $this->checkIfUserExists = $options['checkIfUserExists']; } + if ( isset( $options['debugPrefix'] ) ) { + $this->debugPrefix = $options['debugPrefix']; + } + + if ( isset( $options['reason'] ) ) { + $this->reason = $options['reason']; + } + $this->tables = array(); // Immediate updates $this->tables['image'] = array( 'img_user_text', 'img_user' ); $this->tables['oldimage'] = array( 'oi_user_text', 'oi_user' ); $this->tables['filearchive'] = array('fa_user_text','fa_user'); $this->tablesJob = array(); // Slow updates // If this user has a large number of edits, use the jobqueue - if ( User::newFromId( $uid )->getEditCount() > RENAMEUSER_CONTRIBJOB ) { + if ( User::newFromId( $uid )->getEditCount() > self::CONTRIB_JOB ) { $this->tablesJob['revision'] = array( 'rev_user_text', 'rev_user', 'rev_timestamp' ); $this->tablesJob['archive'] = array( 'ar_user_text', 'ar_user', 'ar_timestamp' ); $this->tablesJob['logging'] = array( 'log_user_text', 'log_user', 'log_timestamp' ); @@ -86,7 +123,14 @@ class RenameuserSQL { $this->tables['recentchanges'] = array( 'rc_user_text', 'rc_user' ); } - wfRunHooks( 'RenameUserSQL', array( $this ) ); + Hooks::run( 'RenameUserSQL', array( $this ) ); + } + + protected function debug( $msg ) { + if ( $this->debugPrefix ) { + $msg = "{$this->debugPrefix}: $msg"; + } + wfDebugLog( 'Renameuser', $msg ); } /** @@ -95,15 +139,17 @@ class RenameuserSQL { function rename() { global $wgMemc, $wgAuth, $wgUpdateRowsPerJob; - wfProfileIn( __METHOD__ ); + // Grab the user's edit count first, used in log entry + $contribs = User::newfromId( $this->uid )->getEditCount(); $dbw = wfGetDB( DB_MASTER ); $dbw->begin(); - wfRunHooks( 'RenameUserPreRename', array( $this->uid, $this->old, $this->new ) ); + Hooks::run( 'RenameUserPreRename', array( $this->uid, $this->old, $this->new ) ); // Rename and touch the user before re-attributing edits, // this avoids users still being logged in and making new edits while // being renamed, which leaves edits at the old name. + $this->debug( "Starting rename of {$this->old} to {$this->new}" ); $dbw->update( 'user', array( 'user_name' => $this->new, 'user_touched' => $dbw->timestamp() ), array( 'user_name' => $this->old, 'user_id' => $this->uid ), @@ -112,7 +158,7 @@ class RenameuserSQL { if ( !$dbw->affectedRows() && $this->checkIfUserExists ) { $dbw->rollback(); - wfProfileOut( __METHOD__ ); + $this->debug( "User {$this->old} does not exist, bailing out" ); return false; } @@ -135,9 +181,16 @@ class RenameuserSQL { // being renamed, which makes admin tasks more of a pain... $oldTitle = Title::makeTitle( NS_USER, $this->old ); $newTitle = Title::makeTitle( NS_USER, $this->new ); + $this->debug( "Updating logging table for {$this->old} to {$this->new}" ); + if ( is_callable( 'SpecialLog::getLogTypesOnUser' ) ) { // 1.25+ + $logTypesOnUser = SpecialLog::getLogTypesOnUser(); + } else { + // Fallback to hardcoded list + $logTypesOnUser = array( 'block', 'rights' ); + } $dbw->update( 'logging', array( 'log_title' => $newTitle->getDBkey() ), - array( 'log_type' => array( 'block', 'rights' ), + array( 'log_type' => $logTypesOnUser, 'log_namespace' => NS_USER, 'log_title' => $oldTitle->getDBkey() ), __METHOD__ ); @@ -221,8 +274,10 @@ class RenameuserSQL { $dbw->freeResult( $res ); } - if ( count( $jobs ) > 0 ) { + $count = count( $jobs ); + if ( $count > 0 ) { JobQueueGroup::singleton()->push( $jobs, JobQueue::QOS_ATOMIC ); // don't commit yet + $this->debug( "Queued $count jobs for {$this->old} to {$this->new}" ); } // Commit the transaction @@ -234,9 +289,24 @@ class RenameuserSQL { // Clear caches and inform authentication plugins $user = User::newFromId( $this->uid ); $wgAuth->updateExternalDB( $user ); - wfRunHooks( 'RenameUserComplete', array( $this->uid, $this->old, $this->new ) ); + Hooks::run( 'RenameUserComplete', array( $this->uid, $this->old, $this->new ) ); + + // Log it! + $logEntry = new ManualLogEntry( 'renameuser', 'renameuser' ); + $logEntry->setPerformer( $this->renamer ); + $logEntry->setTarget( $oldTitle ); + $logEntry->setComment( $this->reason ); + $logEntry->setParameters( array( + '4::olduser' => $this->old, + '5::newuser' => $this->new, + '6::edits' => $contribs + ) ); + $logid = $logEntry->insert(); + $logEntry->publish( $logid ); + + + $this->debug( "Finished rename for {$this->old} to {$this->new}" ); - wfProfileOut( __METHOD__ ); return true; } } diff --git a/extensions/Renameuser/SpecialRenameuser.php b/extensions/Renameuser/SpecialRenameuser.php index 0a78eed0..c8a0cb70 100644 --- a/extensions/Renameuser/SpecialRenameuser.php +++ b/extensions/Renameuser/SpecialRenameuser.php @@ -3,3 +3,7 @@ * Renameuser file for b/c... this sucks */ require_once( __DIR__ . '/Renameuser.php' ); + +$wgExtensionFunctions[] = function() { + wfWarn( 'The deprecated entrypoint of SpecialRenameuser.php is being used. It will be removed in a future release. Use Renameuser.php instead' ); +}; diff --git a/extensions/Renameuser/extension.json b/extensions/Renameuser/extension.json new file mode 100644 index 00000000..b01a6de8 --- /dev/null +++ b/extensions/Renameuser/extension.json @@ -0,0 +1,57 @@ +{ + "name": "Renameuser", + "author": [ + "Ævar Arnfjörð Bjarmason", + "Aaron Schulz" + ], + "url": "https://www.mediawiki.org/wiki/Extension:Renameuser", + "descriptionmsg": "renameuser-desc", + "license-name": "GPL-2.0+", + "type": "specialpage", + "ExtensionMessagesFiles": { + "RenameuserAliases": "Renameuser.alias.php" + }, + "LogTypes": [ + "renameuser" + ], + "MessagesDirs": { + "Renameuser": [ + "i18n" + ] + }, + "Hooks": { + "ShowMissingArticle": [ + "RenameuserHooks::onShowMissingArticle" + ], + "ContributionsToolLinks": [ + "RenameuserHooks::onContributionsToolLinks" + ], + "GetLogTypesOnUser": [ + "RenameuserHooks::onGetLogTypesOnUser" + ] + }, + "JobClasses": { + "renameUser": "RenameUserJob" + }, + "GroupPermissions": { + "bureaucrat": { + "renameuser": true + } + }, + "LogActionsHandlers": { + "renameuser/renameuser": "RenameuserLogFormatter" + }, + "AvailableRights": [ + "renameuser" + ], + "SpecialPages": { + "Renameuser": "SpecialRenameuser" + }, + "AutoloadClasses": { + "RenameuserHooks": "Renameuser.hooks.php", + "RenameUserJob": "RenameUserJob.php", + "RenameuserLogFormatter": "RenameuserLogFormatter.php", + "RenameuserSQL": "RenameuserSQL.php", + "SpecialRenameuser": "specials/SpecialRenameuser.php" + } +} diff --git a/extensions/Renameuser/i18n/ar.json b/extensions/Renameuser/i18n/ar.json index 6e523408..7cf926dc 100644 --- a/extensions/Renameuser/i18n/ar.json +++ b/extensions/Renameuser/i18n/ar.json @@ -5,7 +5,8 @@ "DRIHEM", "Meno25", "Mido", - "OsamaK" + "OsamaK", + "Abanima" ] }, "renameuser": "إعادة تسمية مستخدم", @@ -33,6 +34,7 @@ "renameuser-page-unmoved": "لم يتمكن من نقل الصفحة $1 إلى $2.", "log-name-renameuser": "سجل إعادة تسمية المستخدمين", "log-description-renameuser": "هذا سجل بالتغييرات في أسماء المستخدمين.", + "logentry-renameuser-renameuser": "{{GENDER:$2|غيّر|غيّرت}} $1 اسم $4 ({{PLURAL:$6|تعديل واحد|تعديلان|$6 تعديلات|$6 تعديلاً|$6 تعديل}}) إلى $5", "logentry-renameuser-renameuser-legacier": "$1 أعاد تسمية $4 إلى $5", "renameuser-move-log": "نقل الصفحة تلقائيا خلال إعادة تسمية المستخدم من \"[[User:$1|$1]]\" إلى \"[[User:$2|$2]]\"", "action-renameuser": "إعادة تسمية المستخدمين", diff --git a/extensions/Renameuser/i18n/bn.json b/extensions/Renameuser/i18n/bn.json index 1ed15e27..2e17c3cb 100644 --- a/extensions/Renameuser/i18n/bn.json +++ b/extensions/Renameuser/i18n/bn.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "Bellayet", - "Nasir8891" + "Nasir8891", + "Aftabuzzaman" ] }, "renameuser": "ব্যবহারকারী নামান্তর করো", @@ -30,7 +31,9 @@ "renameuser-page-unmoved": "পাতাটি $1 থেকে $2 তে সরিয়ে নেওয়া যাবে না।", "log-name-renameuser": "ব্যবহারকারী নামান্তরের লগ", "log-description-renameuser": "এটি ব্যাবহারকারী নামের পরিবর্তনের লগ", - "renameuser-move-log": "যখন ব্যবহারকারী \"[[User:$1|$1]]\" থেকে \"[[User:$2|$2]]\" তে নামান্তরিত হবে তখন সয়ঙ্ক্রিয়ভাবে পাতা সরিয়ে নেওয়া হয়েছে", + "logentry-renameuser-renameuser": "$1 ব্যবহারকারী $4 কে ({{PLURAL:$6|$6টি সম্পাদনা}}) $5-এ {{GENDER:$2|নামান্তরিত করেছেন}}", + "logentry-renameuser-renameuser-legacier": "$1 ব্যবহারকারী $4 কে $5-এ নামান্তরিত করেছেন", + "renameuser-move-log": "যখন ব্যবহারকারী \"[[User:$1|$1]]\" থেকে \"[[User:$2|$2]]\" তে নামান্তরিত হয় তখন স্বয়ংক্রিয়ভাবে পাতা সরিয়ে নেওয়া হয়েছে", "action-renameuser": "ব্যবহারকারী নাম পরিবর্তন", "right-renameuser": "ব্যবহারকারীদের পুনরায় নাম দাও", "renameuser-renamed-notice": "এই ব্যবহারকারীর নাম পরিবর্তন করা হয়েছে।\nসূত্র হিসাবে নিচে নাম পরিবর্তন লগ দেওয়া হল।" diff --git a/extensions/Renameuser/i18n/crh-cyrl.json b/extensions/Renameuser/i18n/crh-cyrl.json index bdcb0c31..cfda26c5 100644 --- a/extensions/Renameuser/i18n/crh-cyrl.json +++ b/extensions/Renameuser/i18n/crh-cyrl.json @@ -4,5 +4,7 @@ "Don Alessandro" ] }, + "renameuser-page-moved": "$1 саифесининъ ады $2 деп денъиштирильди.", + "renameuser-page-unmoved": "$1 саифесининъ ады $2 оларакъ денъиштирилип оламай.", "log-name-renameuser": "Къулланыджы ады денъишиклиги журналы" } diff --git a/extensions/Renameuser/i18n/crh-latn.json b/extensions/Renameuser/i18n/crh-latn.json index 7c0db9dd..4971c51d 100644 --- a/extensions/Renameuser/i18n/crh-latn.json +++ b/extensions/Renameuser/i18n/crh-latn.json @@ -4,5 +4,7 @@ "Don Alessandro" ] }, + "renameuser-page-moved": "$1 saifesiniñ adı $2 dep deñiştirildi.", + "renameuser-page-unmoved": "$1 saifesiniñ adı $2 olaraq deñiştirilip olamay.", "log-name-renameuser": "Qullanıcı adı deñişikligi jurnalı" } diff --git a/extensions/Renameuser/i18n/eo.json b/extensions/Renameuser/i18n/eo.json index b6505b45..a0cbabf9 100644 --- a/extensions/Renameuser/i18n/eo.json +++ b/extensions/Renameuser/i18n/eo.json @@ -3,7 +3,8 @@ "authors": [ "ArnoLagrange", "Tlustulimu", - "Yekrats" + "Yekrats", + "KuboF" ] }, "renameuser": "Alinomigi uzanton", @@ -32,7 +33,7 @@ "log-name-renameuser": "Protokolo pri alinomigoj de uzantoj", "log-description-renameuser": "Jen protokolo pri ŝanĝoj de salutnomoj.", "logentry-renameuser-renameuser": "$1 {{GENDER:$2|alinomiĝis}} uzanton $4 ({{PLURAL:$6|$6 redakto|$6 redaktoj}}) al $5", - "logentry-renameuser-renameuser-legacier": "$1 alinomigis uzanton $4 al $5", + "logentry-renameuser-renameuser-legacier": "$1 alinomis uzanton $4 al $5", "renameuser-move-log": "Aŭtomate movis paĝon dum alinomigo de la uzanto \"[[User:$1|$1]]\" al \"[[User:$2|$2]]\"", "action-renameuser": "Alinomigi uzantojn", "right-renameuser": "Alinomigi uzantojn", diff --git a/extensions/Renameuser/i18n/fa.json b/extensions/Renameuser/i18n/fa.json index eb0ff9e9..7960bd9f 100644 --- a/extensions/Renameuser/i18n/fa.json +++ b/extensions/Renameuser/i18n/fa.json @@ -5,7 +5,8 @@ "Huji", "Reza1615", "Wayiran", - "Alirezaaa" + "Alirezaaa", + "Calak" ] }, "renameuser": "تغییر نام کاربر", @@ -35,7 +36,7 @@ "log-description-renameuser": "این سیاههٔ تغییر نام کاربران است.", "logentry-renameuser-renameuser": "$1 نام $4 ({{PLURAL:$6|$6 ویرایش|}}) را به $5 {{GENDER:$2|تغییر داد}}", "logentry-renameuser-renameuser-legacier": "$1 نام کاربری $4 را به $5 تغییر داد", - "renameuser-move-log": "صفحه در ضمن تغییر نام «[[User:$1|$1]]» به «[[User:$2|$2]]» به طور خودکار انتقال داده شد.", + "renameuser-move-log": "صفحه در ضمن تغییر نام کاربر «[[User:$1|$1]]» به «[[User:$2|$2]]» به طور خودکار منتقل شد", "action-renameuser": "تغییر نام کاربران", "right-renameuser": "تغییر نام کاربران", "renameuser-renamed-notice": "این کاربر تغییر نام داده‌است.\nسیاهه تغییر نام در ادامه آمده است." diff --git a/extensions/Renameuser/i18n/fy.json b/extensions/Renameuser/i18n/fy.json index 3b4311c0..50a0d214 100644 --- a/extensions/Renameuser/i18n/fy.json +++ b/extensions/Renameuser/i18n/fy.json @@ -2,14 +2,15 @@ "@metadata": { "authors": [ "SK-luuut", - "Snakesteuben" + "Snakesteuben", + "Robin0van0der0vliet" ] }, "renameuser": "Feroarje in meidochnamme", "renameuser-desc": "Foeget in [[Special:RenameUser|spesiale side]] ta om in meidoggersnamme te feroarjen (jo hawwe hjirfoar it ''renameuser'' rjocht nedich)", "renameuserold": "Alde namme:", "renameusernew": "Nije namme:", - "renameuserreason": "Reden foar nammewiziging:", + "renameuserreason": "Reden:", "renameusermove": "Werneam meidogger en oerlis siden (mei ûnderlizzende siden) nei de nije namme", "renameuserreserve": "Takomst brûken fan de âlde meidoggersnamme foarkomme", "renameuserwarnings": "Warskôgings:", diff --git a/extensions/Renameuser/i18n/he.json b/extensions/Renameuser/i18n/he.json index ad1b6945..f5345946 100644 --- a/extensions/Renameuser/i18n/he.json +++ b/extensions/Renameuser/i18n/he.json @@ -36,7 +36,7 @@ "log-name-renameuser": "יומן שינויי שמות משתמש", "log-description-renameuser": "זהו יומן השינויים בשמות המשתמשים.", "logentry-renameuser-renameuser": "$1 {{GENDER:$2|שינה|שינתה}} את שם המשתמש $4 ‏({{PLURAL:$6|עריכה אחת|$6 עריכות}}) אל $5", - "logentry-renameuser-renameuser-legacier": "$1 {{GENDER:$2|שינה|שינתה}} את שם המשתמש $4 ל{{GRAMMAR:תחילית|$5}}", + "logentry-renameuser-renameuser-legacier": "$1 {{GENDER:$2|שינה|שינתה}} את שם המשתמש $4 ל{{GRAMMAR:תחילית|$5}}‏", "renameuser-move-log": "העברה אוטומטית בעקבות שינוי שם המשתמש \"[[User:$1|$1]]\" ל־\"[[User:$2|$2]]\"", "action-renameuser": "לשנות שמות משתמש", "right-renameuser": "שינוי שמות משתמשים", diff --git a/extensions/Renameuser/i18n/hr.json b/extensions/Renameuser/i18n/hr.json index 95f60050..045f3622 100644 --- a/extensions/Renameuser/i18n/hr.json +++ b/extensions/Renameuser/i18n/hr.json @@ -6,7 +6,8 @@ "Ex13", "Roberta F.", "SpeedyGonsales", - "Tivek" + "Tivek", + "MaGa" ] }, "renameuser": "Preimenuj suradnika", @@ -34,6 +35,7 @@ "renameuser-page-unmoved": "Stranica $1 ne može biti preimenovana u $2.", "log-name-renameuser": "Evidencija preimenovanja suradnika", "log-description-renameuser": "Ovo je evidencija preimenovanja suradničkih imena", + "logentry-renameuser-renameuser": "$1 {{GENDER:$2|je preimenovao|je preimenovala}} suradnika $4 ({{PLURAL:$6|$6 uređivanje|$6 uređivanja|$6 uređivanja}}) u $5.", "renameuser-move-log": "Stranica suradnika je premještena prilikom preimenovanja iz \"[[User:$1|$1]]\" u \"[[User:$2|$2]]\"", "right-renameuser": "Preimenovati suradnike", "renameuser-renamed-notice": "Ovaj suradnik je preimenovan.\nEvidencija preimenovanja suradnika je prikazana ispod kao obavijest." diff --git a/extensions/Renameuser/i18n/kk-cyrl.json b/extensions/Renameuser/i18n/kk-cyrl.json index 817a24a2..57cfd6fb 100644 --- a/extensions/Renameuser/i18n/kk-cyrl.json +++ b/extensions/Renameuser/i18n/kk-cyrl.json @@ -1,22 +1,39 @@ { "@metadata": { "authors": [ - "Arystanbek" + "Arystanbek", + "Нұрлан Рахымжанов" ] }, - "renameuser": "Қатысушыны қайта атау", - "renameuserold": "Ағымдағы қатысушы аты:", + "renameuser": "Қатысушы есімін өзгерту", + "renameuser-linkoncontribs": "қатысушы есімін өзгерту", + "renameuser-linkoncontribs-text": "Бұл қатысушының есімін өзгерту", + "renameuser-desc": "Қатысушы есімін өзгерту [[Special:RenameUser|мүмкіндігін]] қосады (renameuser құқығын қажет етеді)", + "renameuserold": "Қазіргі қатысушы аты:", "renameusernew": "Жаңа қатысушы аты:", - "renameuserreason": "Қайта атау себебі:", + "renameuserreason": "Себебі:", "renameusermove": "Қатысушының жеке және талқылау беттерін (және де олардың төменгі беттерін) жаңа атауға жылжыту", + "renameusersuppress": "Жаңа атауына бағыттау бетін бастамау", + "renameuserreserve": "Бұрынғы қатысушы есімін келешекте қолдана алмайтындай ету", + "renameuserwarnings": "Ескертулер:", + "renameuserconfirm": "Иә, қатысушы есімін өзгерт", "renameusersubmit": "Жіберу", + "renameuser-submit-blocklog": "Қатысушының бұғатталу журналын көрсету", "renameusererrordoesnotexist": "«$1» деген қатысушы жоқ", "renameusererrorexists": "«$1» деген қатысушы бар түге", "renameusererrorinvalid": "«$1» қатысушы аты жарамсыз", - "renameusersuccess": "«$1» деген қатысушы аты «$2» дегенге ауыстырылды", - "renameuser-page-exists": "$1 деген бет бар түге, және өздік түрде оның үстіне ештеңе жазылмайды.", + "renameuser-error-request": "Сұранымды жіберуде мәселе шықты.\nАртқа қайтып қайта байқап көріңіз.", + "renameuser-error-same-user": "Бұрыңғысымен бірдей нәрсе болғандықтан қатысушы есімін өзгерте алмайсыз.", + "renameusersuccess": "«$1» деген қатысушы аты «$2» дегенге ауыстырылды.", + "renameuser-page-exists": "$1 деген бет бар түге және өздігінен үстіне жазылмайды.", "renameuser-page-moved": "$1 деген бет $2 деген бетке жылжытылды.", "renameuser-page-unmoved": "$1 деген бет $2 деген бетке жылжытылмады.", "log-name-renameuser": "Қатысушыны есімін өзгеру журналы", - "renameuser-move-log": "«[[User:$1|$1]]» деген қатысушы атын «[[User:$2|$2]]» дегенге ауысқанда бет өздік түрде жылжытылды" + "log-description-renameuser": "Бұл қатысушы есімдерін өзгерту журналы.", + "logentry-renameuser-renameuser": "$1 қатысушы есімін $4 дегеннен ({{PLURAL:$6|$6 өңдеме жасаған|$6 өңдеме жасаған}}) $5 дегенге {{GENDER:$2|өзгерті}}", + "logentry-renameuser-renameuser-legacier": "$1 қатысушы есімін $4 дегеннен $5 дегенге өзгерті", + "renameuser-move-log": "«[[User:$1|$1]]» деген қатысушы атын «[[User:$2|$2]]» дегенге өзгерткенде бет өздігінен жылжытылды", + "action-renameuser": "қатысушылардың есімін өзгерту", + "right-renameuser": "Қатысушылардың есімін өзгерту", + "renameuser-renamed-notice": "Бұл қатысушының есімі өзгертілді.\nДерек үшін есім өзгерту журналы төменде көрсетілген." } diff --git a/extensions/Renameuser/i18n/krc.json b/extensions/Renameuser/i18n/krc.json index efcb7428..e016a6cd 100644 --- a/extensions/Renameuser/i18n/krc.json +++ b/extensions/Renameuser/i18n/krc.json @@ -4,5 +4,6 @@ "Iltever" ] }, - "renameuser-linkoncontribs": "къошулуучуну атын ауушдур" + "renameuser-linkoncontribs": "къошулуучуну атын ауушдур", + "log-name-renameuser": "Къошулуучуланы атларын ауушдуруу журнал" } diff --git a/extensions/Renameuser/i18n/ksh.json b/extensions/Renameuser/i18n/ksh.json index c6d63078..f42ce440 100644 --- a/extensions/Renameuser/i18n/ksh.json +++ b/extensions/Renameuser/i18n/ksh.json @@ -10,7 +10,7 @@ "renameuser-desc": "[[Special:RenameUser|Metmaacher ömdäufe]] — ävver do bruch mer et Rääsch „renameuser“ för.", "renameuserold": "Dä ahle Metmaacher-Name", "renameusernew": "Dä neue Metmaacher-Name", - "renameuserreason": "Jrund för et Ömdäufe:", + "renameuserreason": "Dä Jrond för et Ömdäufe:", "renameusermove": "De Metmaachersigg met Klaaf- un Ungersigge op dä neue Metmaacher-Name ömstelle", "renameusersuppress": "Donn kein Ömleidong op dä neue Name aanlääje", "renameuserreserve": "Donn dä Name fun dämm Metmaacher dobei sperre, dat_e nit norrens neu aanjemelldt weed.", @@ -29,6 +29,8 @@ "renameuser-page-unmoved": "Di Sigg „$1“ kunnt nit op „$2“ ömjenannt wääde.", "log-name-renameuser": "Logboch vum Metmaacher-Ömdäufe", "log-description-renameuser": "Dat es et Logboch vun de ömjedäufte Metmaachere", + "logentry-renameuser-renameuser": "{{GENDER:$2|Dä|Dat|Dä Metmaacher|De|Dat}} $1 Hät dä Metmaacher „$4“, dä {{PLURAL:$6|ein Änderong|$6 Änderonge|kein Änderonge}} aam Wikki jemaat hät, op „$5“ ömjedäuf.", + "logentry-renameuser-renameuser-legacier": "{{GENDER:$2|Dä|Dat|Dä Metmaacher|De|Dat}} $1 Hät dä Metmaacher „$4“ op „$5“ ömjedäuf.", "renameuser-move-log": "Di Sigg weet automatesch ömjenannt weil mer dä Metmaacher „[[User:$1|$1]]“ op „[[User:$2|$2]]“ öm am däufe sin.", "action-renameuser": "Metmaacher ömdäufe", "right-renameuser": "Metmaacher ömdäufe", diff --git a/extensions/Renameuser/i18n/lrc.json b/extensions/Renameuser/i18n/lrc.json index b6d0b6d2..e732d27e 100644 --- a/extensions/Renameuser/i18n/lrc.json +++ b/extensions/Renameuser/i18n/lrc.json @@ -5,12 +5,29 @@ "Mogoeilor" ] }, + "renameuser": "آلشت دئن نوم کاریار", + "renameuser-linkoncontribs": "آلشت دئن نوم کاریار", + "renameuser-linkoncontribs-text": "آلشت دئن نوم ای کاریار", + "renameuserold": "نوم کاریاری ایسنی:", "renameusernew": "نوم کاروری تازه:", "renameuserreason": "دلیل:", + "renameusersuppress": "سی نوم تازه واگردونی راس نکید", + "renameuserwarnings": "زئناریا:", + "renameuserconfirm": "هری، کاریار نه د نو نوم بنه", + "renameusersubmit": "دئن", "renameuser-submit-blocklog": "قلف پهرستنومه سی کارور نشو بیه", + "renameusererrordoesnotexist": "کاریار \"$1\" وجود ناره.", + "renameusererrorexists": "کاریار \"$1\" ایسه هئیش.", + "renameusererrorinvalid": "کاریار\"$1\" معتور نئ.", + "renameuser-error-same-user": "شما نمی تونیت یه گل کاریار نه چی چی ای که دماتر بیه نوم بنیت.", + "renameusersuccess": "کاریار\"$1\" د نو نوم نیائه بیه\"$2\".", + "renameuser-page-exists": "بلگه $1 ایسنی هئیش و نبوئه خودانجومن فره نویس با.", "renameuser-page-moved": "بلگه $1 د $2 جا وه جا بیه", "renameuser-page-unmoved": "نبوئه بلگه $1 د $2 جا وه جا بوئه", "log-name-renameuser": "پهرستنومه دواره نوم دئن د کارور", "log-description-renameuser": "یه پهرستنومه آلشت دئن نوم کاروریا هئ.", + "logentry-renameuser-renameuser-legacier": "کاریار $1 سی$4 تا$5 د نوم نیائه بیه", + "action-renameuser": "آلشت دئن نوم کاریار", + "right-renameuser": "آلشت دئن نوم کاریار", "renameuser-renamed-notice": "ای کارور یه گل نوم هنی وش دئه بیه.\nپهرستنومه نوم هنی دئن وا سرچشمه زیر دروس بیه." } diff --git a/extensions/Renameuser/i18n/ps.json b/extensions/Renameuser/i18n/ps.json index 059bca18..e7fd00ce 100644 --- a/extensions/Renameuser/i18n/ps.json +++ b/extensions/Renameuser/i18n/ps.json @@ -21,6 +21,7 @@ "renameusererrorinvalid": "د \"$1\" کارن نوم سم نه دی.", "renameuser-error-request": "د غوښتنې په ترلاسه کولو کې يوه ستونزه راپېښه شوه.\nمهرباني وکړی بېرته پرشا ولاړ شی او يو ځل بيا پرې کوښښ وکړی.", "renameuser-page-moved": "د $1 مخ $2 ته ولېږدل شو.", + "renameuser-page-unmoved": "د $1 مخ $2 ته و نه لېږدل شو.", "log-name-renameuser": "د کارن-نوم يادښت", "action-renameuser": "کارن-نومونه بدلول", "right-renameuser": "کارن-نومونه بدلول" diff --git a/extensions/Renameuser/i18n/qqq.json b/extensions/Renameuser/i18n/qqq.json index 92246e18..2ceff6e7 100644 --- a/extensions/Renameuser/i18n/qqq.json +++ b/extensions/Renameuser/i18n/qqq.json @@ -16,7 +16,7 @@ "renameuser": "{{doc-special|RenameUser}}\n{{Identical|Rename user}}", "renameuser-linkoncontribs": "Link description used on [[Special:Contributions]] and [[Special:DeletedContributions]]. Only added if a user has rights to rename users.\n{{Identical|Rename user}}", "renameuser-linkoncontribs-text": "Tooltip for {{msg-mw|renameuser-linkoncontribs}}.", - "renameuser-desc": "{{desc|name=Rename user|url=http://www.mediawiki.org/wiki/Extension:Renameuser}}", + "renameuser-desc": "{{desc|name=Rename user|url=https://www.mediawiki.org/wiki/Extension:Renameuser}}", "renameuser-summary": "{{notranslate}}", "renameuserold": "Used as label for the \"Old username\" input box in [[Special:RenameUser]].\n\nSee also:\n* {{msg-mw|Renameusernew}}", "renameusernew": "Used as label for the \"New username\" input box in [[Special:RenameUser]].\n\nSee also:\n* {{msg-mw|Renameuserold}}", diff --git a/extensions/Renameuser/i18n/ru.json b/extensions/Renameuser/i18n/ru.json index 74504ee0..155e2bf8 100644 --- a/extensions/Renameuser/i18n/ru.json +++ b/extensions/Renameuser/i18n/ru.json @@ -38,7 +38,7 @@ "renameuser-page-unmoved": "Страница $1 не может быть переименована в $2.", "log-name-renameuser": "Журнал переименований участников", "log-description-renameuser": "Это журнал произведённых переименований зарегистрированных участников.", - "logentry-renameuser-renameuser": "$1 {{GENDER:$2|переименовал}} участника $4 ({{PLURAL:$6|$6 правка|$6 правок|$6 правки}}) в $5", + "logentry-renameuser-renameuser": "$1 {{GENDER:$2|переименовал}} участника $4 ({{PLURAL:$6|$6 правка|$6 правки|$6 правок}}) в $5", "logentry-renameuser-renameuser-legacier": "$1 переименовал пользователя $4 в $5", "renameuser-move-log": "Автоматически в связи с переименованием учётной записи «[[User:$1|$1]]» в «[[User:$2|$2]]»", "action-renameuser": "переименование участников", diff --git a/extensions/Renameuser/i18n/sr-ec.json b/extensions/Renameuser/i18n/sr-ec.json index 8d8e9c79..831c29b2 100644 --- a/extensions/Renameuser/i18n/sr-ec.json +++ b/extensions/Renameuser/i18n/sr-ec.json @@ -22,7 +22,7 @@ "renameuserreserve": "Блокирај старо корисничко име за даљу употребу", "renameuserwarnings": "Упозорења:", "renameuserconfirm": "Да, преименуј корисника", - "renameusersubmit": "Прихвати", + "renameusersubmit": "Пошаљи", "renameuser-submit-blocklog": "Дневник блокирања за корисника", "renameusererrordoesnotexist": "Корисник „$1“ не постоји.", "renameusererrorexists": "Корисник „$1“ већ постоји.", @@ -35,7 +35,7 @@ "renameuser-page-unmoved": "Страница $1 не може да се премести на $2.", "log-name-renameuser": "Дневник преименовања корисника", "log-description-renameuser": "Испод је списак преименованих корисника.", - "logentry-renameuser-renameuser": "$1 је {{GENDER:$2|преименовао|преименовала}} корисника $4 ({{PLURAL:$6|$6 измену|$6 измена}}) у $5", + "logentry-renameuser-renameuser": "$1 је {{GENDER:$2|преименовао|преименовала}} корисника $4 ({{PLURAL:$6|$6 измена|$6 измене|$6 измена}}) у $5", "logentry-renameuser-renameuser-legacier": "$1 је преименовао корисника $4 у $5", "renameuser-move-log": "Аутоматско премештање странице због преименовања корисника „[[User:$1|$1]]“ у „[[User:$2|$2]]“", "action-renameuser": "преименовање корисника", diff --git a/extensions/Renameuser/i18n/sr-el.json b/extensions/Renameuser/i18n/sr-el.json index dea54752..ea3137c8 100644 --- a/extensions/Renameuser/i18n/sr-el.json +++ b/extensions/Renameuser/i18n/sr-el.json @@ -20,7 +20,7 @@ "renameuserreserve": "Blokiraj staro korisničko ime za dalju upotrebu", "renameuserwarnings": "Upozorenja:", "renameuserconfirm": "Da, preimenuj korisničko ime.", - "renameusersubmit": "Prihvati", + "renameusersubmit": "Pošalji", "renameuser-submit-blocklog": "Dnevnik blokiranja za korisnika", "renameusererrordoesnotexist": "Korisnik „$1“ ne postoji.", "renameusererrorexists": "Korisnik \"$1\" već postoji", @@ -33,7 +33,8 @@ "renameuser-page-unmoved": "Stranica $1 ne može biti premeštena na $2.", "log-name-renameuser": "Dnevnik preimenovanja korisnika", "log-description-renameuser": "Ispod je spisak preimenovanih korisnika.", - "logentry-renameuser-renameuser": "$1 je {{GENDER:$2|preimenovao|preimenovala}} korisnika $4 ({{PLURAL:$6|$6 izmenu|$6 izmena}}) u $5", + "logentry-renameuser-renameuser": "$1 je {{GENDER:$2|preimenovao|preimenovala}} korisnika $4 ({{PLURAL:$6|$6 izmena|$6 izmene|$6 izmena}}) u $5", + "logentry-renameuser-renameuser-legacier": "$1 je preimenovao korisnika $4 u $5", "renameuser-move-log": "Automatsko premeštanje stranice zbog preimenovanja korisnika „[[User:$1|$1]]“ u „[[User:$2|$2]]“", "action-renameuser": "preimenovanje korisnika", "right-renameuser": "preimenovanje korisničkih imena", diff --git a/extensions/Renameuser/i18n/uz.json b/extensions/Renameuser/i18n/uz.json index 9f445dff..a15bc500 100644 --- a/extensions/Renameuser/i18n/uz.json +++ b/extensions/Renameuser/i18n/uz.json @@ -5,5 +5,7 @@ "Sociologist" ] }, - "log-name-renameuser": "Foydalanuvchilarni qayta nomlash qaydlari" + "log-name-renameuser": "Foydalanuvchilarni qayta nomlash qaydlari", + "action-renameuser": "foydalanuvchilar nomini oʻzgartirish", + "right-renameuser": "Foydalanuvchilar nomini oʻzgartirish" } diff --git a/extensions/Renameuser/i18n/zh-hant.json b/extensions/Renameuser/i18n/zh-hant.json index eb393083..5683bad2 100644 --- a/extensions/Renameuser/i18n/zh-hant.json +++ b/extensions/Renameuser/i18n/zh-hant.json @@ -10,13 +10,14 @@ "Wrightbus", "Cwlin0416", "Liflon", - "LNDDYL" + "LNDDYL", + "Liuxinyu970226" ] }, "renameuser": "重新命名使用者", "renameuser-linkoncontribs": "重新命名使用者", "renameuser-linkoncontribs-text": "重新命名此使用者", - "renameuser-desc": "加入用來重新命名使用者的 [[Special:RenameUser|特殊頁面]] (需要開啟 ''renameuser'' 權限)", + "renameuser-desc": "加入用來重新命名使用者的[[Special:RenameUser|特殊頁面]] (需要開啟 ''renameuser'' 權限)", "renameuserold": "目前的使用者名稱：", "renameusernew": "新的使用者名稱：", "renameuserreason": "原因：", @@ -24,7 +25,7 @@ "renameusersuppress": "不要為新的名稱建立重新導向頁面", "renameuserreserve": "封鎖舊使用者名稱，禁止日後再使用", "renameuserwarnings": "警告：", - "renameuserconfirm": "是，重新命名使用者", + "renameuserconfirm": "是的，重新命名此使用者", "renameusersubmit": "送出", "renameuser-submit-blocklog": "顯示使用者的封鎖日誌", "renameusererrordoesnotexist": "使用者 \"$1\" 不存在。", @@ -38,10 +39,10 @@ "renameuser-page-unmoved": "頁面 $1 無法移動至 $2。", "log-name-renameuser": "使用者重新命名日誌", "log-description-renameuser": "此頁面為使用者名稱修改日誌。", - "logentry-renameuser-renameuser": "$1 {{GENDER:$2|重新命名}}使用者 $4 (已編輯 {{PLURAL:$6|$6 次|$6 次}}) 為 $5", + "logentry-renameuser-renameuser": "$1 {{GENDER:$2|重新命名}}使用者 $4 (已編輯 {{PLURAL:$6|$6 次}}) 為 $5", "logentry-renameuser-renameuser-legacier": "$1 重新命名使用者 $4 為 $5", "renameuser-move-log": "重新命名使用者 \"[[User:$1|$1]]\" 為 \"[[User:$2|$2]]\" 時已自動移動使用者相關頁面", "action-renameuser": "重新命名使用者", "right-renameuser": "重新命名使用者", - "renameuser-renamed-notice": "該使用者已重新命名。\n下列為重新命名日誌以提供參考。" + "renameuser-renamed-notice": "本使用者已重新命名。\n下列為重新命名日誌以提供參考。" } diff --git a/extensions/Renameuser/specials/SpecialRenameuser.php b/extensions/Renameuser/specials/SpecialRenameuser.php index f6b9bac1..c8b2a538 100644 --- a/extensions/Renameuser/specials/SpecialRenameuser.php +++ b/extensions/Renameuser/specials/SpecialRenameuser.php @@ -54,7 +54,7 @@ class SpecialRenameuser extends SpecialPage { $warnings = array(); if ( $oun && $nun && !$request->getCheck( 'confirmaction' ) ) { - wfRunHooks( 'RenameUserWarning', array( $oun, $nun, &$warnings ) ); + Hooks::run( 'RenameUserWarning', array( $oun, $nun, &$warnings ) ); } $out->addHTML( @@ -259,16 +259,19 @@ class SpecialRenameuser extends SpecialPage { return; } - // Always get the edits count, it will be used for the log message - $contribs = $olduser->getEditCount(); - // Give other affected extensions a chance to validate or abort - if ( !wfRunHooks( 'RenameUserAbort', array( $uid, $oldusername->getText(), $newusername->getText() ) ) ) { + if ( !Hooks::run( 'RenameUserAbort', array( $uid, $oldusername->getText(), $newusername->getText() ) ) ) { return; } // Do the heavy lifting... - $rename = new RenameuserSQL( $oldusername->getText(), $newusername->getText(), $uid ); + $rename = new RenameuserSQL( + $oldusername->getText(), + $newusername->getText(), + $uid, + $this->getUser(), + array( 'reason' => $reason ) + ); if ( !$rename->rename() ) { return; } @@ -279,20 +282,6 @@ class SpecialRenameuser extends SpecialPage { $user->setName( $newusername->getText() ); } - // Log this rename, updated to 1.19+ Log form. - // https://www.mediawiki.org/wiki/Logging_to_Special:Log - $logEntry = new ManualLogEntry( 'renameuser', 'renameuser' ); - $logEntry->setPerformer( $this->getUser() ); - $logEntry->setTarget( $oldusername ); - $logEntry->setComment( $reason ); - $logEntry->setParameters( array( - '4::olduser' => $oldusername->getText(), - '5::newuser' => $newusername->getText(), - '6::edits' => $contribs - ) ); - $logid = $logEntry->insert(); - $logEntry->publish( $logid ); - // Move any user pages if ( $request->getCheck( 'movepages' ) && $user->isAllowed( 'move' ) ) { $dbr = wfGetDB( DB_SLAVE ); @@ -380,4 +369,8 @@ class SpecialRenameuser extends SpecialPage { $out->addHTML( Xml::element( 'h2', null, $logPage->getName()->text() ) . "\n" ); LogEventsList::showLogExtract( $out, $type, $username->getPrefixedText() ); } + + protected function getGroupName() { + return 'users'; + } } -- cgit v1.2.2