jenkins-bot has submitted this change and it was merged.
Change subject: Simplify showtabdialog logic a little bit
......................................................................
Simplify showtabdialog logic a little bit
Don't unnecessarily nest if statements, don't check tabs preference twice
Change-Id: I788d978b2e13030104be7ea295137a09abc032a8
---
M VisualEditor.hooks.php
1 file changed, 19 insertions(+), 23 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 94bbf67..77466e2 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -234,32 +234,28 @@
return true;
}
+ $dbr = wfGetDB( DB_SLAVE );
if (
$config->get( 'VisualEditorUseSingleEditTab' ) &&
- $user->getOption( 'visualeditor-tabs' ) !== 'multi-tab'
+ !$user->isAnon() &&
+ !$user->getOption( 'visualeditor-autodisable' ) &&
+ !$user->getOption( 'visualeditor-betatempdisable' ) &&
+ !$user->getOption( 'visualeditor-hidetabdialog' ) &&
+ $user->getOption( 'visualeditor-tabs' ) ===
'remember-last' &&
+ $dbr->select(
+ 'revision',
+ '1',
+ [
+ 'rev_user' => $user->getId(),
+ 'rev_timestamp < ' . $dbr->addQuotes(
+ $config->get(
'VisualEditorSingleEditTabSwitchTime' )
+ )
+ ],
+ __METHOD__,
+ [ 'LIMIT' => 1 ]
+ )->numRows() === 1
) {
- $dbr = wfGetDB( DB_SLAVE );
- if (
- !$user->isAnon() &&
- !$user->getOption( 'visualeditor-autodisable' )
&&
- !$user->getOption(
'visualeditor-betatempdisable' ) &&
- !$user->getOption( 'visualeditor-hidetabdialog'
) &&
- $user->getOption( 'visualeditor-tabs' ) ===
'remember-last' &&
- $dbr->select(
- 'revision',
- '1',
- [
- 'rev_user' => $user->getId(),
- 'rev_timestamp < ' .
$dbr->addQuotes(
- $config->get(
'VisualEditorSingleEditTabSwitchTime' )
- )
- ],
- __METHOD__,
- [ 'LIMIT' => 1 ]
- )->numRows() === 1
- ) {
- $links['views']['edit']['class'] .= '
visualeditor-showtabdialog';
- }
+ $links['views']['edit']['class'] .= '
visualeditor-showtabdialog';
}
// Exit if the user doesn't have VE enabled
--
To view, visit https://gerrit.wikimedia.org/r/275269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I788d978b2e13030104be7ea295137a09abc032a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
