From 21bd2a5b186a23805cb885075eccc244c73ddafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 18 Apr 2017 19:47:04 +0200 Subject: [PATCH] Fix logic for redirecting unsupported browsers to old editor Browsers that support JavaScript, but that get served a no-JS experience by MediaWiki (for example, IE 6), would always get redirected to an URL with &venoscript=1 - even when it was unnecessary because we're not in single-tab mode, and even when the form was previously submitted, causing the loss of user input. Follow-up to 188ec0f5d23c0daa55bdea1a019a6b9232fe411e. Bug: T163226 Change-Id: I212baa0f4305559fa6f6abdfa230b76c122d4909 --- VisualEditor.hooks.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 79825485b5..3ffe8210e3 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -173,14 +173,14 @@ class VisualEditorHooks { $titleMsg = $title->exists() ? 'editing' : 'creating'; $out->setPageTitle( wfMessage( $titleMsg, $title->getPrefixedText() ) ); $out->addWikiMsg( 'visualeditor-toload', wfExpandUrl( $url ) ); + $out->addScript( Html::inlineScript( + "(window.NORLQ=window.NORLQ||[]).push(" . + "function(){" . + "location.href=\"$url\";" . + "}" . + ");" + ) ); } - $out->addScript( Html::inlineScript( - "(window.NORLQ=window.NORLQ||[]).push(" . - "function(){" . - "location.href=\"$url\";" . - "}" . - ");" - ) ); return $ret; }