From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sat, 23 Sep 2017 21:07:15 +0000 (-0700)
Subject: EditPage: Disable preview on open if $wgRawHtml is enabled
X-Git-Tag: 1.31.0-rc.0~1975^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=c61d1894d0f635a124fe4f21d9ae7cae8595fef1;p=lhc%2Fweb%2Fwiklou.git

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
---

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;