fix bug 41280, show correct content when displaying edit conflicts

Change-Id: I52522c06d20ddab85799dc33a0d07c10603a20a7

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 15321fc..4db697f 100644 (file)
--- 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" );
                                }
                        }