jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389656 )
Change subject: Add missing static keyword for doUserIdMerge
......................................................................
Add missing static keyword for doUserIdMerge
Bug: T179891
Change-Id: If4be92dffa41fc1deaf4b8e8422441f73a656e6c
---
M backend/MWOAuth.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/MWOAuth.hooks.php b/backend/MWOAuth.hooks.php
index 42683e9..b561a8e 100644
--- a/backend/MWOAuth.hooks.php
+++ b/backend/MWOAuth.hooks.php
@@ -70,7 +70,7 @@
return true;
}
- protected function doUserIdMerge( $oldid, $newid ) {
+ protected static function doUserIdMerge( $oldid, $newid ) {
$dbw = MWOAuthUtils::getCentralDB( DB_MASTER );
// Merge any consumers register to this user
$dbw->update( 'oauth_registered_consumer',
--
To view, visit https://gerrit.wikimedia.org/r/389656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4be92dffa41fc1deaf4b8e8422441f73a656e6c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
