wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use CentralIdLookup instead of hardcoding for CentralAuth"

Browse source
This commit is contained in:
jenkins-bot 2015-12-09 01:09:46 +00:00 committed by Gerrit Code Review
parent 02ec5fe213 999c53a1c3
commit 84fb2e5a83
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/UnreadWikis.php
View file

@ -28,24 +28,19 @@ class EchoUnreadWikis {
}
/**
* If CentralAuth is installed, use that. Otherwise
* assume they're using shared user tables.
* Use the user id provided by the CentralIdLookup
*
* @param User $user
* @return EchoUnreadWikis|bool
*/
public static function newFromUser( User $user ) {
if ( class_exists( 'CentralAuthUser' ) ) {
// @todo don't be CA specific (see T111302/CentralIdLookup)
$caUser = CentralAuthUser::getInstance( $user );
if ( $caUser->isAttached() ) {
return new self( $caUser->getId() );
} else {
return false;
}
$lookup = CentralIdLookup::factory();
$id = $lookup->centralIdFromLocalUser( $user, CentralIdLookup::AUDIENCE_RAW );
if ( !$id ) {
return false;
}
return new self( $user->getId() );
return new self( $id );
}
/**