Merge "Simplify showtabdialog logic a little bit"

This commit is contained in:
jenkins-bot 2016-03-07 23:28:50 +00:00 committed by Gerrit Code Review
commit 1a64d83138

View file

@ -234,12 +234,9 @@ class VisualEditorHooks {
return true;
}
if (
$config->get( 'VisualEditorUseSingleEditTab' ) &&
$user->getOption( 'visualeditor-tabs' ) !== 'multi-tab'
) {
$dbr = wfGetDB( DB_SLAVE );
if (
$config->get( 'VisualEditorUseSingleEditTab' ) &&
!$user->isAnon() &&
!$user->getOption( 'visualeditor-autodisable' ) &&
!$user->getOption( 'visualeditor-betatempdisable' ) &&
@ -260,7 +257,6 @@ class VisualEditorHooks {
) {
$links['views']['edit']['class'] .= ' visualeditor-showtabdialog';
}
}
// Exit if the user doesn't have VE enabled
if (