[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Replace 'steward' by 'renamer' in variables
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/359002 ) Change subject: Replace 'steward' by 'renamer' in variables .. Replace 'steward' by 'renamer' in variables Because I can rename accounts even if I'm not steward :) We have a "Global renamers" group at WMF wikis Change-Id: I7b98dd7fbc0fc0c2e1ebbd14a3e1afdb5ef4c08c --- M includes/specials/SpecialGlobalRenameQueue.php 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialGlobalRenameQueue.php b/includes/specials/SpecialGlobalRenameQueue.php index c67d64d..d8c070e 100644 --- a/includes/specials/SpecialGlobalRenameQueue.php +++ b/includes/specials/SpecialGlobalRenameQueue.php @@ -264,21 +264,21 @@ 'globalrenamequeue-request-reason-sul' )->parseAsBlock(); - $steward = CentralAuthUser::newFromId( $req->getPerformer() ); - if ( $steward === false ) { + $renamer = CentralAuthUser::newFromId( $req->getPerformer() ); + if ( $renamer === false ) { throw new Exception( "The perfomer's global user id ({$req->getPerformer()}) does not exist in the database" ); } - if ( $steward->isAttached() ) { - $stewardLink = Title::makeTitleSafe( NS_USER, $steward->getName() )->getFullURL(); + if ( $renamer->isAttached() ) { + $renamerLink = Title::makeTitleSafe( NS_USER, $renamer->getName() )->getFullURL(); } else { - $stewardLink = WikiMap::getForeignURL( - $steward->getHomeWiki(), "User:{$steward->getName()}" + $renamerLink = WikiMap::getForeignURL( + $renamer->getHomeWiki(), "User:{$renamer->getName()}" ); } - // Done as one big message so that stewards can create a local + // Done as one big message so that admins can create a local // translation to customize the output as they see fit. // @TODO: Do that actually in here... this is not how we do interfaces in 2015. $viewMsg = $this->msg( 'globalrenamequeue-view', @@ -292,8 +292,8 @@ $this->getLanguage()->userTimeAndDate( $req->getCompleted(), $this->getUser() ), - $stewardLink, - $steward->getName(), + $renamerLink, + $renamer->getName(), $req->getComments() )->parseAsBlock(); $this->getOutput()->addHtml( '' . $viewMsg . '' ); @@ -832,12 +832,12 @@ $formatted = $this->mOwner->getLinkRenderer()->makeLink( $title, $value ); break; case 'rq_performer': - $steward = CentralAuthUser::newFromId( $value ); + $renamer = CentralAuthUser::newFromId( $value ); $formatted = '' . WikiMap::foreignUserLink( - $steward->getHomeWiki(), - $steward->getName(), - $steward->getName() + $renamer->getHomeWiki(), + $renamer->getName(), + $renamer->getName() ) . ''; break; case 'row_actions': -- To view, visit https://gerrit.wikimedia.org/r/359002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b98dd7fbc0fc0c2e1ebbd14a3e1afdb5ef4c08c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: FramawikiGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Replace 'steward' by 'renamer' in variables
Framawiki has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/359002 ) Change subject: Replace 'steward' by 'renamer' in variables .. Replace 'steward' by 'renamer' in variables Because I can rename accounts even if I'm not steward :) We have a "Global renamers" group at WMF wikis Change-Id: I7b98dd7fbc0fc0c2e1ebbd14a3e1afdb5ef4c08c --- M includes/specials/SpecialGlobalRenameQueue.php 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/02/359002/1 diff --git a/includes/specials/SpecialGlobalRenameQueue.php b/includes/specials/SpecialGlobalRenameQueue.php index c67d64d..d8c070e 100644 --- a/includes/specials/SpecialGlobalRenameQueue.php +++ b/includes/specials/SpecialGlobalRenameQueue.php @@ -264,21 +264,21 @@ 'globalrenamequeue-request-reason-sul' )->parseAsBlock(); - $steward = CentralAuthUser::newFromId( $req->getPerformer() ); - if ( $steward === false ) { + $renamer = CentralAuthUser::newFromId( $req->getPerformer() ); + if ( $renamer === false ) { throw new Exception( "The perfomer's global user id ({$req->getPerformer()}) does not exist in the database" ); } - if ( $steward->isAttached() ) { - $stewardLink = Title::makeTitleSafe( NS_USER, $steward->getName() )->getFullURL(); + if ( $renamer->isAttached() ) { + $renamerLink = Title::makeTitleSafe( NS_USER, $renamer->getName() )->getFullURL(); } else { - $stewardLink = WikiMap::getForeignURL( - $steward->getHomeWiki(), "User:{$steward->getName()}" + $renamerLink = WikiMap::getForeignURL( + $renamer->getHomeWiki(), "User:{$renamer->getName()}" ); } - // Done as one big message so that stewards can create a local + // Done as one big message so that admins can create a local // translation to customize the output as they see fit. // @TODO: Do that actually in here... this is not how we do interfaces in 2015. $viewMsg = $this->msg( 'globalrenamequeue-view', @@ -292,8 +292,8 @@ $this->getLanguage()->userTimeAndDate( $req->getCompleted(), $this->getUser() ), - $stewardLink, - $steward->getName(), + $renamerLink, + $renamer->getName(), $req->getComments() )->parseAsBlock(); $this->getOutput()->addHtml( '' . $viewMsg . '' ); @@ -832,12 +832,12 @@ $formatted = $this->mOwner->getLinkRenderer()->makeLink( $title, $value ); break; case 'rq_performer': - $steward = CentralAuthUser::newFromId( $value ); + $renamer = CentralAuthUser::newFromId( $value ); $formatted = '' . WikiMap::foreignUserLink( - $steward->getHomeWiki(), - $steward->getName(), - $steward->getName() + $renamer->getHomeWiki(), + $renamer->getName(), + $renamer->getName() ) . ''; break; case 'row_actions': -- To view, visit https://gerrit.wikimedia.org/r/359002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b98dd7fbc0fc0c2e1ebbd14a3e1afdb5ef4c08c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Framawiki___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits