From: aude <aude.wiki@gmail.com>
Date: Wed, 24 Oct 2012 21:03:14 +0000 (+0000)
Subject: follow up for edit conflicts
X-Git-Tag: 1.31.0-rc.0~21878
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=f9093954b01d0679018c2e1e71212f1ec87fbc8e;p=lhc%2Fweb%2Fwiklou.git

follow up for edit conflicts

Change-Id: I511b78664fd2c14d63a1d399cb5ddefa2d125a22
---

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