http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90855
Revision: 90855
Author: aaron
Date: 2011-06-26 21:44:55 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
Follow-up r90749: use a new 'autopromote' action for the autopromote rights log
entries. Removed the 'rightsautocomment' msg.
Modified Paths:
--------------
trunk/phase3/includes/Autopromote.php
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/LogPage.php
trunk/phase3/includes/User.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/includes/Autopromote.php
===================================================================
--- trunk/phase3/includes/Autopromote.php 2011-06-26 20:41:26 UTC (rev
90854)
+++ trunk/phase3/includes/Autopromote.php 2011-06-26 21:44:55 UTC (rev
90855)
@@ -46,13 +46,13 @@
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;
}
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2011-06-26 20:41:26 UTC (rev
90854)
+++ trunk/phase3/includes/DefaultSettings.php 2011-06-26 21:44:55 UTC (rev
90855)
@@ -4846,34 +4846,35 @@
* 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',
);
/**
Modified: trunk/phase3/includes/LogPage.php
===================================================================
--- trunk/phase3/includes/LogPage.php 2011-06-26 20:41:26 UTC (rev 90854)
+++ trunk/phase3/includes/LogPage.php 2011-06-26 21:44:55 UTC (rev 90855)
@@ -217,7 +217,7 @@
$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 ) {
Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php 2011-06-26 20:41:26 UTC (rev 90854)
+++ trunk/phase3/includes/User.php 2011-06-26 21:44:55 UTC (rev 90855)
@@ -1128,9 +1128,9 @@
$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 ) )
);
}
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-06-26 20:41:26 UTC
(rev 90854)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-06-26 21:44:55 UTC
(rev 90855)
@@ -1978,11 +1978,11 @@
'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',
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2011-06-26 20:41:26 UTC
(rev 90854)
+++ trunk/phase3/maintenance/language/messages.inc 2011-06-26 21:44:55 UTC
(rev 90855)
@@ -1142,8 +1142,8 @@
'rightslog',
'rightslogtext',
'rightslogentry',
+ 'rightslogentry-autopromote',
'rightsnone',
- 'rightsautocomment',
),
'action' => array(
'action-read',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
