From e9af948c3ed5c8f2fe6c98a40bf4387aed1f42ef Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Fri, 1 Apr 2016 14:29:06 +0300
Subject: [PATCH] Hooks#onAuthPluginAutoCreate: Only act if not default

Change-Id: If52c23b523953aabf52ef3e889a77b422a149c63
---
 VisualEditor.hooks.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index efe0bca33e..3c6fe77191 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -956,6 +956,7 @@ class VisualEditorHooks {
 	public static function onAuthPluginAutoCreate( $user ) {
 		if (
 			RequestContext::getMain()->getConfig()->get( 'VisualEditorAutoAccountEnable' ) &&
+			!User::getDefaultOption( 'visualeditor-editor' ) &&
 			$user->isLoggedin()
 		) {
 			$user->setOption( 'visualeditor-enable', 1 );