Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/264615
Change subject: Remove no-longer used GlobalCssJs/GlobalUserPage hooks
......................................................................
Remove no-longer used GlobalCssJs/GlobalUserPage hooks
They have been replaced by CentralIdLookup.
Change-Id: Ie14a86f6a9bc271a24d23212a898afd6dc295e5a
Depends-On: I18ececd8e8c67e6135e307993fdc76096e7d8d34
Depends-On: I8b6862e941c342aceb84691f71b1d20fe4f5eaba
---
M CentralAuth.php
M includes/CentralAuthHooks.php
2 files changed, 0 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/15/264615/1
diff --git a/CentralAuth.php b/CentralAuth.php
index a3b849a..6f240d6 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -434,12 +434,6 @@
$wgHooks['OAuthGetCentralIdFromUserName'][] =
'CentralAuthHooks::onOAuthGetCentralIdFromUserName';
$wgHooks['OAuthGetUserNamesFromCentralIds'][] =
'CentralAuthHooks::onOAuthGetUserNamesFromCentralIds';
-// For GlobalCssJs
-$wgHooks['LoadGlobalCssJs'][] = 'CentralAuthHooks::onLoadGlobalCssJs';
-
-// For GlobalUserPage
-$wgHooks['LoadGlobalUserPage'][] = 'CentralAuthHooks::onLoadGlobalUserPage';
-
// For UserMerge
$wgHooks['DeleteAccount'][] = 'CentralAuthHooks::onDeleteAccount';
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index bf1e66a..6d85043 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1445,43 +1445,6 @@
}
/**
- * @param User $user
- * @param string $global wikiID of global wiki
- * @param string $local wikiID of wiki user is currently on
- * @return bool
- * @see
https://www.mediawiki.org/wiki/Extension:GlobalCssJs/LoadGlobalCssJs
- */
- public static function onLoadGlobalCssJs( User $user, $global, $local )
{
- return self::isUserTheSameOn( $user, $global, $local );
- }
-
- /**
- * @param User $user
- * @param string $global wikiID of global wiki
- * @param string $local wikiID of wiki user is currently on
- * @return bool
- * @see
https://www.mediawiki.org/wiki/Extension:GlobalUserPage/LoadGlobalUserPage
- */
- public static function onLoadGlobalUserPage( User $user, $global,
$local ) {
- return self::isUserTheSameOn( $user, $global, $local );
- }
-
- /**
- * Helper for LoadGlobalCssJs and LoadGlobalUserPage
- * hooks.
- *
- * @param User $user
- * @param string $global
- * @param string $local
- * @return bool
- */
- private static function isUserTheSameOn( User $user, $global, $local ) {
- $caUser = CentralAuthUser::getInstance( $user );
-
- return $caUser->attachedOn( $global ) && $caUser->attachedOn(
$local );
- }
-
- /**
* Hook for UserMerge extension after an account is deleted
* @param User &$user account that was just deleted
* @return bool
--
To view, visit https://gerrit.wikimedia.org/r/264615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie14a86f6a9bc271a24d23212a898afd6dc295e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
