From 6f8addb3652ead632d11c7e008d235af8e318b6a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 26 Jun 2011 21:44:55 +0000 Subject: [PATCH] Follow-up r90749: use a new 'autopromote' action for the autopromote rights log entries. Removed the 'rightsautocomment' msg. --- includes/Autopromote.php | 2 +- includes/DefaultSettings.php | 57 ++++++++++++++++--------------- includes/LogPage.php | 2 +- includes/User.php | 4 +-- languages/messages/MessagesEn.php | 10 +++--- maintenance/language/messages.inc | 2 +- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/includes/Autopromote.php b/includes/Autopromote.php index d4f9b2f799..fa54edbb72 100644 --- a/includes/Autopromote.php +++ b/includes/Autopromote.php @@ -46,13 +46,13 @@ class Autopromote { if ( isset( $wgAutopromoteOnce[$event] ) && count( $wgAutopromoteOnce[$event] ) ) { $currentGroups = $user->getGroups(); + $formerGroups = $user->getFormerGroups(); foreach ( $wgAutopromoteOnce[$event] as $group => $cond ) { // Do not check if the user's already a member if ( in_array( $group, $currentGroups ) ) { continue; } // Do not autopromote if the user has belonged to the group - $formerGroups = $user->getFormerGroups(); if ( in_array( $group, $formerGroups ) ) { continue; } diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 85a0a9e50a..86a93bba7d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -4846,34 +4846,35 @@ $wgLogHeaders = array( * Extensions with custom log types may add to this array. */ $wgLogActions = array( - 'block/block' => 'blocklogentry', - 'block/unblock' => 'unblocklogentry', - 'block/reblock' => 'reblock-logentry', - 'protect/protect' => 'protectedarticle', - 'protect/modify' => 'modifiedarticleprotection', - 'protect/unprotect' => 'unprotectedarticle', - 'protect/move_prot' => 'movedarticleprotection', - 'rights/rights' => 'rightslogentry', - 'rights/disable' => 'disableaccount-logentry', - 'delete/delete' => 'deletedarticle', - 'delete/restore' => 'undeletedarticle', - 'delete/revision' => 'revdelete-logentry', - 'delete/event' => 'logdelete-logentry', - 'upload/upload' => 'uploadedimage', - 'upload/overwrite' => 'overwroteimage', - 'upload/revert' => 'uploadedimage', - 'move/move' => '1movedto2', - 'move/move_redir' => '1movedto2_redir', - 'import/upload' => 'import-logentry-upload', - 'import/interwiki' => 'import-logentry-interwiki', - 'merge/merge' => 'pagemerge-logentry', - 'suppress/revision' => 'revdelete-logentry', - 'suppress/file' => 'revdelete-logentry', - 'suppress/event' => 'logdelete-logentry', - 'suppress/delete' => 'suppressedarticle', - 'suppress/block' => 'blocklogentry', - 'suppress/reblock' => 'reblock-logentry', - 'patrol/patrol' => 'patrol-log-line', + 'block/block' => 'blocklogentry', + 'block/unblock' => 'unblocklogentry', + 'block/reblock' => 'reblock-logentry', + 'protect/protect' => 'protectedarticle', + 'protect/modify' => 'modifiedarticleprotection', + 'protect/unprotect' => 'unprotectedarticle', + 'protect/move_prot' => 'movedarticleprotection', + 'rights/rights' => 'rightslogentry', + 'rights/autopromote' => 'rightslogentry-autopromote', + 'rights/disable' => 'disableaccount-logentry', + 'delete/delete' => 'deletedarticle', + 'delete/restore' => 'undeletedarticle', + 'delete/revision' => 'revdelete-logentry', + 'delete/event' => 'logdelete-logentry', + 'upload/upload' => 'uploadedimage', + 'upload/overwrite' => 'overwroteimage', + 'upload/revert' => 'uploadedimage', + 'move/move' => '1movedto2', + 'move/move_redir' => '1movedto2_redir', + 'import/upload' => 'import-logentry-upload', + 'import/interwiki' => 'import-logentry-interwiki', + 'merge/merge' => 'pagemerge-logentry', + 'suppress/revision' => 'revdelete-logentry', + 'suppress/file' => 'revdelete-logentry', + 'suppress/event' => 'logdelete-logentry', + 'suppress/delete' => 'suppressedarticle', + 'suppress/block' => 'blocklogentry', + 'suppress/reblock' => 'reblock-logentry', + 'patrol/patrol' => 'patrol-log-line', ); /** diff --git a/includes/LogPage.php b/includes/LogPage.php index 4afa12f44d..744563176d 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -217,7 +217,7 @@ class LogPage { $rv = wfMsgHtml( $wgLogActions[$key] ); } else { $titleLink = self::getTitleLink( $type, $skin, $title, $params ); - if( $key == 'rights/rights' ) { + if( preg_match( '/^rights\/(rights|autopromote)/', $key ) ) { if( $skin ) { $rightsnone = wfMsg( 'rightsnone' ); foreach ( $params as &$param ) { diff --git a/includes/User.php b/includes/User.php index c3dd8ea9bf..6bd26a4e85 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1128,9 +1128,9 @@ class User { $newGroups = array_merge( $oldGroups, $toPromote ); // all groups $log = new LogPage( 'rights', false /* not in RC */ ); - $log->addEntry( 'rights', + $log->addEntry( 'autopromote', $this->getUserPage(), - wfMsgForContent( 'rightsautocomment' ), + '', // no comment array( implode( ', ', $oldGroups ), implode( ', ', $newGroups ) ) ); } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7ae8e66191..ed1f86c5be 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1978,11 +1978,11 @@ Your e-mail address is not revealed when other users contact you.', 'right-sendemail' => 'Send e-mail to other users', # User rights log -'rightslog' => 'User rights log', -'rightslogtext' => 'This is a log of changes to user rights.', -'rightslogentry' => 'changed group membership for $1 from $2 to $3', -'rightsnone' => '(none)', -'rightsautocomment' => 'automatically promoted', +'rightslog' => 'User rights log', +'rightslogtext' => 'This is a log of changes to user rights.', +'rightslogentry' => 'changed group membership for $1 from $2 to $3', +'rightslogentry-autopromote' => 'was automatically promoted from $2 to $3', +'rightsnone' => '(none)', # Associated actions - in the sentence "You do not have permission to X" 'action-read' => 'read this page', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index d620d76819..94b5a1de7b 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1142,8 +1142,8 @@ $wgMessageStructure = array( 'rightslog', 'rightslogtext', 'rightslogentry', + 'rightslogentry-autopromote', 'rightsnone', - 'rightsautocomment', ), 'action' => array( 'action-read', -- 2.20.1