jenkins-bot has submitted this change and it was merged.

Change subject: Properly mark UserGetImplicitGroups hook as deprecated
......................................................................


Properly mark UserGetImplicitGroups hook as deprecated

Change-Id: Idef74f9950d5f8e133cd19f67e8486e94ec95882
---
M docs/hooks.txt
M includes/User.php
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/hooks.txt b/docs/hooks.txt
index 7ec6ff5..1e4be55 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2882,7 +2882,7 @@
 &$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 90d33fb..0066a3e 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -4417,8 +4417,8 @@
                global $wgImplicitGroups;
 
                $groups = $wgImplicitGroups;
-               # Deprecated, use $wgImplictGroups instead
-               wfRunHooks( 'UserGetImplicitGroups', array( &$groups ) );
+               # Deprecated, use $wgImplicitGroups instead
+               wfRunHooks( 'UserGetImplicitGroups', array( &$groups ), '1.25' 
);
 
                return $groups;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/168341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idef74f9950d5f8e133cd19f67e8486e94ec95882
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to