Merge "Properly mark UserGetImplicitGroups hook as deprecated"

diff --combined includes/User.php
index 8fcdab2,0066a3e..c4a6127
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -641,11 -641,10 +641,11 @@@ class User implements IDBAccessObject 
                global $wgContLang, $wgMaxNameChars;
  
                if ( $name == ''
 -              || User::isIP( $name )
 -              || strpos( $name, '/' ) !== false
 -              || strlen( $name ) > $wgMaxNameChars
 -              || $name != $wgContLang->ucfirst( $name ) ) {
 +                      || User::isIP( $name )
 +                      || strpos( $name, '/' ) !== false
 +                      || strlen( $name ) > $wgMaxNameChars
 +                      || $name != $wgContLang->ucfirst( $name )
 +              ) {
                        wfDebugLog( 'username', __METHOD__ .
                                ": '$name' invalid due to empty, IP, slash, length, or lowercase" );
                        return false;
@@@ -4418,8 -4417,8 +4418,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;
        }
@@@ -4512,7 -4511,6 +4512,7 @@@
  
                // Same thing for remove
                if ( empty( $wgRemoveGroups[$group] ) ) {
 +                      // Do nothing
                } elseif ( $wgRemoveGroups[$group] === true ) {
                        $groups['remove'] = self::getAllGroups();
                } elseif ( is_array( $wgRemoveGroups[$group] ) ) {
@@@ -4538,7 -4536,6 +4538,7 @@@
  
                // Now figure out what groups the user can add to him/herself
                if ( empty( $wgGroupsAddToSelf[$group] ) ) {
 +                      // Do nothing
                } elseif ( $wgGroupsAddToSelf[$group] === true ) {
                        // No idea WHY this would be used, but it's there
                        $groups['add-self'] = User::getAllGroups();
@@@ -4547,7 -4544,6 +4547,7 @@@
                }
  
                if ( empty( $wgGroupsRemoveFromSelf[$group] ) ) {
 +                      // Do nothing
                } elseif ( $wgGroupsRemoveFromSelf[$group] === true ) {
                        $groups['remove-self'] = User::getAllGroups();
                } elseif ( is_array( $wgGroupsRemoveFromSelf[$group] ) ) {