From 999c53a1c3d75c4165eae2bdaafb96cecab656e3 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 8 Dec 2015 16:54:23 -0800 Subject: [PATCH] Use CentralIdLookup instead of hardcoding for CentralAuth Change-Id: I5b2d23588ab6b026d1a2100b9c16a74e9aefbd73 --- includes/UnreadWikis.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/includes/UnreadWikis.php b/includes/UnreadWikis.php index e165eaa0c..53391340b 100644 --- a/includes/UnreadWikis.php +++ b/includes/UnreadWikis.php @@ -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 ); } /**