jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362874 )
Change subject: GoogleUser::hasConnectedGoogleAccount should be called statically ...................................................................... GoogleUser::hasConnectedGoogleAccount should be called statically The hook MergeAccountFromTo does not provide an instance of GoogleUser and the method hasConnectedGoogleAccount is anyway a static method and therefore should be called statically. Bug: T169635 Change-Id: I4e5c0e9fca1abb44c95a002f707bc940ea015137 --- M includes/GoogleLogin.hooks.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GoogleLogin.hooks.php b/includes/GoogleLogin.hooks.php index 509645c..476b72a 100644 --- a/includes/GoogleLogin.hooks.php +++ b/includes/GoogleLogin.hooks.php @@ -60,9 +60,9 @@ // the new user exists (e.g. is not Anonymous) !$newUser->isAnon() && // the new user doesn't has a google connection already - !$newUser->hasConnectedGoogleAccount() && + !GoogleUser::hasConnectedGoogleAccount( $newUser ) && // the old user has a google connection - $oldUser->hasConnectedGoogleAccount() + GoogleUser::hasConnectedGoogleAccount( $oldUser ) ) { // save the google id of the old account $googleIds = GoogleUser::getGoogleIdFromUser( $oldUser ); -- To view, visit https://gerrit.wikimedia.org/r/362874 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e5c0e9fca1abb44c95a002f707bc940ea015137 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/GoogleLogin Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits