From cb3a56bbcaf5cb8cc8531a23abad9f0660563d42 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 29 May 2004 16:20:08 +0000
Subject: [PATCH] Fixed bug in edit conflict merge feature -- didn't decompress
 old_text

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 61729bde87..4ebf6e7009 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -542,7 +542,9 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 		$res = wfQuery("SELECT old_text FROM old WHERE old_namespace = $ns AND ".
 		  "old_title = '{$title}' AND old_timestamp = '{$oldDate}'", DB_WRITE);
 		$obj = wfFetchObject($res);
-		if(wfMerge($obj->old_text, $text, $yourtext, $result)){
+		$oldText = Article::getRevisionText( $obj );
+		
+		if(wfMerge($oldText, $text, $yourtext, $result)){
 			$text = $result;
 			return true;
 		} else {
-- 
2.20.1