From c61d1894d0f635a124fe4f21d9ae7cae8595fef1 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sat, 23 Sep 2017 14:07:15 -0700 Subject: [PATCH] EditPage: Disable preview on open if $wgRawHtml is enabled Otherwise the user will see a session failure message since their request wasn't posted with a token, which doesn't make sense since they just clicked on an edit link. Bug: T172251 Change-Id: Id4a20818c737886f5a7ec72dba52c531f1ba78a0 --- includes/EditPage.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index aa1f205a7d..b499d9611d 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -821,8 +821,15 @@ class EditPage { * @return bool */ protected function previewOnOpen() { - $previewOnOpenNamespaces = $this->context->getConfig()->get( 'PreviewOnOpenNamespaces' ); + $config = $this->context->getConfig(); + $previewOnOpenNamespaces = $config->get( 'PreviewOnOpenNamespaces' ); $request = $this->context->getRequest(); + if ( $config->get( 'RawHtml' ) ) { + // If raw HTML is enabled, disable preview on open + // since it has to be posted with a token for + // security reasons + return false; + } if ( $request->getVal( 'preview' ) == 'yes' ) { // Explicit override from request return true; -- 2.20.1