Merge "Drop UserGetImplictGroups, deprecated since 1.25"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index ab74912..d4fd414 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -346,6 +346,7 @@ because of Phabricator reports.
 * File / MediaHandler::getStreamHeaders(), deprecated since 1.30, was removed.
 * The hook 'DoEditSectionLink', deprecated since 1.25, has been removed. Use
   the hook 'SkinEditSectionLinks' instead.
+* The hook 'UserGetImplicitGroups', deprecated since 1.25, has been removed.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit

diff --git a/docs/hooks.txt b/docs/hooks.txt
index e80e179..9757a7e 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3724,10 +3724,6 @@ $user: User object
 &$timestamp: timestamp, change this to override local email authentication
   timestamp
 
-'UserGetImplicitGroups': DEPRECATED since 1.25!
-Called in User::getImplicitGroups().
-&$groups: List of implicit (automatically-assigned) groups
-
 'UserGetLanguageObject': Called when getting user's interface language object.
 $user: User object
 &$code: Language code that will be used to create the object

diff --git a/includes/user/User.php b/includes/user/User.php
index ada5dc9..fe9a5c9 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -5123,16 +5123,13 @@ class User implements IDBAccessObject, UserIdentity {
 
        /**
         * Get a list of implicit groups
+        * TODO: Should we deprecate this? It's trivial, but we don't want to encourage use of globals.
+        *
         * @return array Array of Strings Array of internal group names
         */
        public static function getImplicitGroups() {
                global $wgImplicitGroups;
-
-               $groups = $wgImplicitGroups;
-               # Deprecated, use $wgImplicitGroups instead
-               Hooks::run( 'UserGetImplicitGroups', [ &$groups ], '1.25' );
-
-               return $groups;
+               return $wgImplicitGroups;
        }
 
        /**