From: C. Scott Ananian <cscott@cscott.net>
Date: Thu, 11 Oct 2018 13:05:05 +0000 (-0400)
Subject: Only expand `{{...}}` in messages once
X-Git-Tag: 1.34.0-rc.0~3817
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=709e94e05c3dc30475372ae7865e7a96c995d836;p=lhc%2Fweb%2Fwiklou.git

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

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>' );
 			}
 		}
 	}