jenkins-bot has submitted this change and it was merged.
Change subject: Avoid CAS update errors on password reset
......................................................................
Avoid CAS update errors on password reset
This could be caused by double posts or hook conflicts.
Bug: T95839
Change-Id: If362c8d0c9f9ded76b185cd717638b06775be885
---
M includes/specials/SpecialPreferences.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialPreferences.php
b/includes/specials/SpecialPreferences.php
index 49ab6d5..b45946f 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -128,7 +128,7 @@
throw new PermissionsError( 'editmyoptions' );
}
- $user = $this->getUser();
+ $user = $this->getUser()->getInstanceForUpdate();
$user->resetOptions( 'all', $this->getContext() );
$user->saveSettings();
--
To view, visit https://gerrit.wikimedia.org/r/260533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If362c8d0c9f9ded76b185cd717638b06775be885
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
