From: Tobias <churchofemacs@users.mediawiki.org>
Date: Sat, 10 Apr 2010 14:11:40 +0000 (+0000)
Subject: fixing bug 23139 (introduced in r59655) which broke edit conflict resolution
X-Git-Tag: 1.31.0-rc.0~37163
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=47fadf1ed16e463583c116f25f04aafd2d7e1cd7;p=lhc%2Fweb%2Fwiklou.git

fixing bug 23139 (introduced in r59655) which broke edit conflict resolution
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 47ec0a415d..c7eaa21d65 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1295,7 +1295,7 @@ HTML
 			// and fallback to the raw wpTextbox1 since editconflicts can't be
 			// resolved between page source edits and custom ui edits using the
 			// custom edit ui.
-			$this->showTextbox1();
+			$this->showTextbox1( null, $this->getContent() );
 		} else {
 			$this->showContentForm();
 		}
@@ -1775,7 +1775,11 @@ INPUTS
 		$wgOut->addHTML( "	<span class='editHelp'>{$cancel}{$separator}{$edithelp}</span>\n" );
 		$wgOut->addHTML( "</div><!-- editButtons -->\n</div><!-- editOptions -->\n" );
 	}
-	
+
+	/*
+	 * Show an edit conflict. textbox1 is already shown in showEditForm().
+	 * If you want to use another entry point to this function, be careful.
+	 */
 	protected function showConflict() {
 		global $wgOut;
 		$this->textbox2 = $this->textbox1;