Drop the UserRights hook, deprecated in 1.26

Change-Id: Ib4dc6f495c0d1d2aa1f41c1f61e09437f33c9077

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index f8aafd9..05c43cd 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -234,6 +234,8 @@ because of Phabricator reports.
   deprecated in 1.20.
 * PrefixSearch::titleSearch(), deprecated in 1.23, has been removed. Use the
   TitlePrefixSearch or StringPrefixSearch classes instead.
+* The UserRights hook, deprecated in 1.26, has been removed. Instead, use the
+  UserGroupsChanged hook.
 * …
 
 === Deprecations in 1.34 ===

diff --git a/docs/hooks.txt b/docs/hooks.txt
index b275adc..e3ea66e 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3832,12 +3832,6 @@ message(s).
 &$user: user retrieving new talks messages
 &$talks: array of new talks page(s)
 
-'UserRights': DEPRECATED since 1.26! Use UserGroupsChanged instead.
-After a user's group memberships are changed.
-&$user: User object that was changed
-$add: Array of strings corresponding to groups added
-$remove: Array of strings corresponding to groups removed
-
 'UserSaveOptions': Called just before saving user preferences. Hook handlers can
 either add or manipulate options, or reset one back to it's default to block
 changing it. Hook handlers are also allowed to abort the process by returning

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index fc54890..1c87f7a 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -405,8 +405,6 @@ class UserrightsPage extends SpecialPage {
                wfDebug( 'newGroups: ' . print_r( $newGroups, true ) . "\n" );
                wfDebug( 'oldUGMs: ' . print_r( $oldUGMs, true ) . "\n" );
                wfDebug( 'newUGMs: ' . print_r( $newUGMs, true ) . "\n" );
-               // Deprecated in favor of UserGroupsChanged hook
-               Hooks::run( 'UserRights', [ &$user, $add, $remove ], '1.26' );
 
                // Only add a log entry if something actually changed
                if ( $newGroups != $oldGroups || $newUGMs != $oldUGMs ) {