Merge "Properly mark UserGetImplicitGroups hook as deprecated"

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 7ec6ff5..1e4be55 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2882,7 +2882,7 @@ $user: User object
 &$timestamp: timestamp, change this to override local email authentication
   timestamp
 
-'UserGetImplicitGroups': Called in User::getImplicitGroups().
+'UserGetImplicitGroups': DEPRECATED, called in User::getImplicitGroups().
 &$groups: List of implicit (automatically-assigned) groups
 
 'UserGetLanguageObject': Called when getting user's interface language object.

diff --git a/includes/User.php b/includes/User.php
index 8fcdab2..c4a6127 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -4418,8 +4418,8 @@ class User implements IDBAccessObject {
                global $wgImplicitGroups;
 
                $groups = $wgImplicitGroups;
-               # Deprecated, use $wgImplictGroups instead
-               wfRunHooks( 'UserGetImplicitGroups', array( &$groups ) );
+               # Deprecated, use $wgImplicitGroups instead
+               wfRunHooks( 'UserGetImplicitGroups', array( &$groups ), '1.25' );
 
                return $groups;
        }