Wikia: r47828: UserLogin: bugid 20806, 20611 - update getUser() in FBConnectDB class to sync local user. - support facebook proxy email. - update messages

garbear · garbear · commit 4e6aecde3884 · 2012-02-15T03:22:51.000-08:00
(cherry picked from http://trac.wikia-code.com/changeset/47828)
diff --git a/Facebook/FacebookDB.php b/Facebook/FacebookDB.php
@@ -100,7 +100,23 @@ public static function getUser( $fbid ) {
 			__METHOD__
 		);
 		if ( $id ) {
-			return User::newFromId( $id );
+			/* Wikia change - begin */
+			global $wgExternalAuthType;
+			
+			$user = User::newFromId( $id );
+			if ( $wgExternalAuthType ) {
+				$user->load();
+				if ( $user->getId() == 0 ) {
+					$mExtUser = ExternalUser::newFromId( $id );
+					if ( is_object( $mExtUser ) && ( $mExtUser->getId() != 0 ) ) {
+						$mExtUser->linkToLocal( $mExtUser->getId() );
+						$user->setId( $id );
+					}
+				}
+			}
+			
+			return $user;
+			/* Wikia change - end */
 		} else {
 			return null;
 		}
