From fb7eec53e94262f24c7c11d801a3ac2125045d99 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 23 Oct 2014 10:51:47 -0700 Subject: [PATCH] Properly mark UserGetImplicitGroups hook as deprecated Change-Id: Idef74f9950d5f8e133cd19f67e8486e94ec95882 --- docs/hooks.txt | 2 +- includes/User.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/hooks.txt b/docs/hooks.txt index 7ec6ff5c7b..1e4be55bbb 100644 --- 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 90d33fb434..0066a3e291 100644 --- a/includes/User.php +++ b/includes/User.php @@ -4417,8 +4417,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; } -- 2.20.1