Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/388682 )
Change subject: Add missing username to centralauth-rename-abortlogin message
......................................................................
Add missing username to centralauth-rename-abortlogin message
The message does have a $1 parameter, which is missed, resulting in an
incomplete link to [[Special:GlobalRenameProgress/$1]].
Change-Id: Ic9abc130852097a7a792dd1f50a5c881c5a257b4
---
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/CentralAuthSecondaryAuthenticationProvider.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/82/388682/1
diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 9d96793..3e67100 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -402,7 +402,7 @@
// Rename in progress?
if ( $centralUser->renameInProgressOn( wfWikiID(),
$options['flags'] ) ) {
- $status->fatal( 'centralauth-rename-abortlogin' );
+ $status->fatal( 'centralauth-rename-abortlogin',
$user->getName() );
return $status;
}
diff --git a/includes/CentralAuthSecondaryAuthenticationProvider.php
b/includes/CentralAuthSecondaryAuthenticationProvider.php
index 332b42c..85e460b 100644
--- a/includes/CentralAuthSecondaryAuthenticationProvider.php
+++ b/includes/CentralAuthSecondaryAuthenticationProvider.php
@@ -45,7 +45,7 @@
$rename = $centralUser->renameInProgressOn( wfWikiID() );
if ( $rename ) {
// This wiki specifically has a rename in progress, so
always abort
- return AuthenticationResponse::newFail( wfMessage(
'centralauth-rename-abortlogin' ) );
+ return AuthenticationResponse::newFail( wfMessage(
'centralauth-rename-abortlogin', $user->getName() ) );
}
// Now check if the user is the target of a rename anywhere
@@ -62,7 +62,7 @@
if ( $newCAUser->isAttached() ) {
// If there is an account using that name that
exists on this wiki
// reject the login.
- return AuthenticationResponse::newFail(
wfMessage( 'centralauth-rename-abortlogin' ) );
+ return AuthenticationResponse::newFail(
wfMessage( 'centralauth-rename-abortlogin', $user->getName() ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/388682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9abc130852097a7a792dd1f50a5c881c5a257b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
