jenkins-bot has submitted this change and it was merged.
Change subject: Add 'reason' to UserGroupsChanged hook
......................................................................
Add 'reason' to UserGroupsChanged hook
Used by Echo to display the reason in the 'user-rights' notifications
Bug: T126277
Change-Id: Ib9bb28a7a77602e3e729fd0bf13ab8259e15b006
---
M docs/hooks.txt
M includes/specials/SpecialUserrights.php
M includes/user/User.php
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 0fe888f..038df91 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3285,6 +3285,8 @@
$added: Groups added
$removed: Groups removed
$performer: User who performed the change, false if via autopromotion
+$reason: The reason, if any, given by the user performing the change,
+false if via autopromotion.
'UserIsBlockedFrom': Check if a user is blocked from a specific page (for
specific block exemptions).
diff --git a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index 7351c33..205b67e 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -292,7 +292,7 @@
$user->invalidateCache();
// update groups in external authentication database
- Hooks::run( 'UserGroupsChanged', array( $user, $add, $remove,
$this->getUser() ) );
+ Hooks::run( 'UserGroupsChanged', array( $user, $add, $remove,
$this->getUser(), $reason ) );
$wgAuth->updateExternalDBGroups( $user, $add, $remove );
wfDebug( 'oldGroups: ' . print_r( $oldGroups, true ) . "\n" );
diff --git a/includes/user/User.php b/includes/user/User.php
index 749ec46..95e5ceb 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1387,7 +1387,7 @@
$this->addGroup( $group );
}
// update groups in external authentication database
- Hooks::run( 'UserGroupsChanged', array( $this, $toPromote,
array(), false ) );
+ Hooks::run( 'UserGroupsChanged', array( $this, $toPromote,
array(), false, false ) );
$wgAuth->updateExternalDBGroups( $this, $toPromote );
$newGroups = array_merge( $oldGroups, $toPromote ); // all
groups
--
To view, visit https://gerrit.wikimedia.org/r/269305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9bb28a7a77602e3e729fd0bf13ab8259e15b006
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
