From b4ab8a73b5b6b18801684b355961c9f1b4856733 Mon Sep 17 00:00:00 2001
From: "Mr. E23" <e23@users.mediawiki.org>
Date: Sun, 14 Mar 2004 13:42:16 +0000
Subject: [PATCH] Fixed broken edit conflict page

---
 includes/EditPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index d07630d669..f69192476b 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -355,12 +355,12 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 
 		if ( $isConflict ) {
 			$wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
-			DifferenceEngine::showDiff( $wpTextbox2, $wpTextbox1,
+			DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
 			  wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
 
 			$wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
 <textarea tabindex=6 name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
-. htmlspecialchars( $wgLang->recodeForEdit( $wpTextbox2 ) ) .
+. htmlspecialchars( $wgLang->recodeForEdit( $this->textbox2 ) ) .
 "
 </textarea>" );
 		}
-- 
2.20.1