From e80f3311d2cd81b0541834f78f7da6bf29f02270 Mon Sep 17 00:00:00 2001 From: aude Date: Tue, 23 Oct 2012 09:52:58 +0000 Subject: [PATCH] fix bug 41280, show correct content when displaying edit conflicts Change-Id: I52522c06d20ddab85799dc33a0d07c10603a20a7 --- includes/EditPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 15321fc091..4db697fab4 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1476,7 +1476,7 @@ class EditPage { wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" ); } else { $this->section = ''; - #$this->textbox1 = $text; #redundant, nothing to do here? + $this->textbox1 = ContentHandler::getContentText( $content ); wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" ); } } -- 2.20.1