From f9093954b01d0679018c2e1e71212f1ec87fbc8e Mon Sep 17 00:00:00 2001 From: aude Date: Wed, 24 Oct 2012 21:03:14 +0000 Subject: [PATCH] follow up for edit conflicts Change-Id: I511b78664fd2c14d63a1d399cb5ddefa2d125a22 --- includes/EditPage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 7ebcde0faa..88afb66fe3 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1468,6 +1468,7 @@ class EditPage { $this->isConflict = true; $content = $textbox_content; // do not try to merge here! } elseif ( $this->isConflict ) { + $contentObj = $content; # Attempt merge if ( $this->mergeChangesInto( $content ) ) { // Successful merge! Maybe we should tell the user the good news? @@ -1476,7 +1477,7 @@ class EditPage { wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" ); } else { $this->section = ''; - $this->textbox1 = ContentHandler::getContentText( $content ); + $this->textbox1 = ContentHandler::getContentText( $contentObj ); wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" ); } } -- 2.20.1