From 709e94e05c3dc30475372ae7865e7a96c995d836 Mon Sep 17 00:00:00 2001
From: "C. Scott Ananian" <cscott@cscott.net>
Date: Thu, 11 Oct 2018 09:05:05 -0400
Subject: [PATCH] Only expand `{{...}}` in messages once

If we're going to call `OutputPage::addWikiText` to parse the message,
we don't need to pre-expand `{{...}}` markup before passing it to the
parser.  This makes these callsites consistent with how
`OutputPage::addWikiMsg()` inserts messages.

Bug: T206574
Change-Id: I2f68f73365df876e6f9d017e4e3ddea39c4a1284
---
 includes/EditPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6b79538e79..7143c3f324 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2991,7 +2991,7 @@ ERROR;
 					$this->contentFormat,
 					$ex->getMessage()
 				);
-				$out->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
+				$out->addWikiText( '<div class="error">' . $msg->plain() . '</div>' );
 			}
 		}
 
@@ -3466,7 +3466,7 @@ ERROR;
 					$this->contentFormat,
 					$ex->getMessage()
 				);
-				$out->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
+				$out->addWikiText( '<div class="error">' . $msg->plain() . '</div>' );
 			}
 		}
 	}
-- 
2.20.1