wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 06:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Defer preferences update and avoid CAS errors in onUserLoggedIn()"

Browse source
This commit is contained in:
jenkins-bot 2016-08-19 00:15:08 +00:00 committed by Gerrit Code Review
parent 166588c726 5f8dfc4b8f
commit dce96deee1
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
VisualEditor.hooks.php
View file

@ -1009,9 +1009,17 @@ class VisualEditorHooks {
public static function onUserLoggedIn( $user ) { public static function onUserLoggedIn( $user ) {
$cookie = RequestContext::getMain()->getRequest()->getCookie( 'VEE', '' ); $cookie = RequestContext::getMain()->getRequest()->getCookie( 'VEE', '' );
if ( $cookie === 'visualeditor' || $cookie === 'wikitext' ) { if ( $cookie === 'visualeditor' || $cookie === 'wikitext' ) {
$user->setOption( 'visualeditor-editor', $cookie ); DeferredUpdates::addUpdate( new AtomicSectionUpdate(
$user->saveSettings(); wfGetDB( DB_MASTER ),
__METHOD__,
function () use ( $user, $cookie ) {
$uLatest = $user->getInstanceForUpdate();
$uLatest->setOption( 'visualeditor-editor', $cookie );
$uLatest->saveSettings();
}
) );
} }
return true; return true;
} }
} }