From d256b472f73956ee8e2503e0254a1107baa1f00a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 13 Apr 2019 16:43:06 -0700
Subject: [PATCH] parser: use "-" for revision ID for non-preview edit filter
 parse during save

This avoids a double parse when the edit stash is not used,
which can be confirmed via the SaveParse log for a page
using {{REVISIONID}} when edit stashing is disabled. This
now matches the reuse for the edit stash hit case.

Change-Id: I405c39d4d7ac04e39fbdfe400f73238b734c7833
---
 includes/parser/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 91de550fad..c28d842af2 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2607,7 +2607,7 @@ class Parser {
 			// @TODO: disallow this word on all namespaces
 			$this->nsInfo->isContent( $this->mTitle->getNamespace() )
 		) {
-			if ( $this->mRevisionId ) {
+			if ( $this->mRevisionId || $this->mOptions->getSpeculativeRevId() ) {
 				return '-';
 			} else {
 				$this->mOutput->setFlag( 'vary-revision-exists' );
-- 
2.20.1