Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305595

Change subject: Defer preferences update and avoid CAS errors in 
onUserLoggedIn()
......................................................................

Defer preferences update and avoid CAS errors in onUserLoggedIn()

Bug: T143367
Change-Id: I9509f6ef565d9953f9c05b00b02b57098eef9e3a
---
M VisualEditor.hooks.php
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/95/305595/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index ea08c82..e60cdc9 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -1009,9 +1009,17 @@
        public static function onUserLoggedIn( $user ) {
                $cookie = RequestContext::getMain()->getRequest()->getCookie( 
'VEE', '' );
                if ( $cookie === 'visualeditor' || $cookie === 'wikitext' ) {
-                       $user->setOption( 'visualeditor-editor', $cookie );
-                       $user->saveSettings();
+                       DeferredUpdates::addUpdate( new AtomicSectionUpdate(
+                               wfGetDB( DB_MASTER ),
+                               __METHOD__,
+                               function () use ( $user, $cookie ) {
+                                       $uLatest = 
$user->getInstanceForUpdate();
+                                       $uLatest->setOption( 
'visualeditor-editor', $cookie );
+                                       $uLatest->saveSettings();
+                               }
+                       ) );
                }
+
                return true;
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/305595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9509f6ef565d9953f9c05b00b02b57098eef9e3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to