CSteipp has submitted this change and it was merged. Change subject: Renamed mwoauthupdateconsumer => mwoauthupdateownconsumer ......................................................................
Renamed mwoauthupdateconsumer => mwoauthupdateownconsumer Change-Id: I49bdb7d67b067bcddc8de43f8b38e2e4b21f744c --- M OAuth.config.php M control/MWOAuthConsumerSubmitControl.php M frontend/language/MWOAuth.i18n.php M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php 4 files changed, 8 insertions(+), 8 deletions(-) Approvals: CSteipp: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/OAuth.config.php b/OAuth.config.php index 87fb243..bcab084 100644 --- a/OAuth.config.php +++ b/OAuth.config.php @@ -136,7 +136,7 @@ $wgMWOAuthRequestExpirationAge = 30 * 86400; $wgAvailableRights[] = 'mwoauthproposeconsumer'; -$wgAvailableRights[] = 'mwoauthupdateconsumer'; +$wgAvailableRights[] = 'mwoauthupdateownconsumer'; $wgAvailableRights[] = 'mwoauthmanageconsumer'; $wgAvailableRights[] = 'mwoauthsuppress'; $wgAvailableRights[] = 'mwoauthviewsuppressed'; diff --git a/control/MWOAuthConsumerSubmitControl.php b/control/MWOAuthConsumerSubmitControl.php index b7dbe9d..a85e5f4 100644 --- a/control/MWOAuthConsumerSubmitControl.php +++ b/control/MWOAuthConsumerSubmitControl.php @@ -171,7 +171,7 @@ return $this->success( $cmr ); case 'update': - if ( !$user->isAllowed( 'mwoauthupdateconsumer' ) ) { + if ( !$user->isAllowed( 'mwoauthupdateownconsumer' ) ) { return $this->failure( 'permission_denied', 'badaccess-group0' ); } diff --git a/frontend/language/MWOAuth.i18n.php b/frontend/language/MWOAuth.i18n.php index 330fa8f..f19b240 100644 --- a/frontend/language/MWOAuth.i18n.php +++ b/frontend/language/MWOAuth.i18n.php @@ -233,7 +233,7 @@ 'mwoauth-callback-not-oob' => 'oauth_callback must be set, and must be set to "oob" (case-sensitive)', 'right-mwoauthproposeconsumer' => 'Propose new OAuth consumers', - 'right-mwoauthupdateconsumer' => 'Update OAuth consumers', + 'right-mwoauthupdateownconsumer' => 'Update OAuth consumers you control', 'right-mwoauthmanageconsumer' => 'Manage OAuth consumers', 'right-mwoauthsuppress' => 'Suppress OAuth consumers', 'right-mwoauthviewsuppressed' => 'View suppressed OAuth consumers', @@ -243,7 +243,7 @@ 'action-mwoauthmanageconsumer' => 'manage OAuth consumers', 'action-mwoauthmanagemygrants' => 'manage your OAuth grants', 'action-mwoauthproposeconsumer' => 'propose new OAuth consumers', - 'action-mwoauthupdateconsumer' => 'update OAuth consumers', + 'action-mwoauthupdateownconsumer' => 'update OAuth consumers you control', 'action-mwoauthviewsuppressed' => 'view suppressed OAuth consumers', ); @@ -527,7 +527,7 @@ {{Identical|View your watchlist}}', 'mwoauth-callback-not-oob' => 'Warning that the OAuth developer failed to include the required "oauth_callback" parameter, which must be set to the case-sensitive string "oob"', 'right-mwoauthproposeconsumer' => '{{doc-right|mwoauthproposeconsumer}}', - 'right-mwoauthupdateconsumer' => '{{doc-right|mwoauthupdateconsumer}}', + 'right-mwoauthupdateownconsumer' => '{{doc-right|mwoauthupdateownconsumer}}', 'right-mwoauthmanageconsumer' => '{{doc-right|mwoauthmanageconsumer}} {{Identical|Manage OAuth consumer}}', 'right-mwoauthsuppress' => '{{doc-right|mwoauthsuppress}}', @@ -538,7 +538,7 @@ {{Identical|Manage OAuth consumer}}', 'action-mwoauthmanagemygrants' => '{{Doc-action|mwoauthmanagemygrants}}', 'action-mwoauthproposeconsumer' => '{{Doc-action|mwoauthproposeconsumer}}', - 'action-mwoauthupdateconsumer' => '{{Doc-action|mwoauthupdateconsumer}}', + 'action-mwoauthupdateownconsumer' => '{{Doc-action|mwoauthupdateownconsumer}}', 'action-mwoauthviewsuppressed' => '{{Doc-action|mwoauthviewsuppressed}}', ); diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php index 9107886..95417e5 100644 --- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php +++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php @@ -172,8 +172,8 @@ } break; case 'update': - if ( !$user->isAllowed( 'mwoauthupdateconsumer' ) ) { - throw new PermissionsError( 'mwoauthupdateconsumer' ); + if ( !$user->isAllowed( 'mwoauthupdateownconsumer' ) ) { + throw new PermissionsError( 'mwoauthupdateownconsumer' ); } $dbr = MWOAuthUtils::getCentralDB( DB_SLAVE ); -- To view, visit https://gerrit.wikimedia.org/r/79166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49bdb7d67b067bcddc8de43f8b38e2e4b21f744c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: CSteipp <cste...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits