From c132234fcef2d4648f591ad12564fb5477ae4dc1 Mon Sep 17 00:00:00 2001
From: Anders Wegge Jakobsen <wegge@users.mediawiki.org>
Date: Sat, 28 May 2005 12:21:56 +0000
Subject: [PATCH] Reduce the risk of dropping edits during conflict resolution

---
 includes/EditPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 281d18b75d..0db73435a6 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -863,7 +863,7 @@ END
 	function mergeChangesInto( &$text ){
 		$yourtext = $this->mArticle->fetchRevisionText();
 		
-		$db =& wfGetDB( DB_SLAVE );
+		$db =& wfGetDB( DB_MASTER );
 		$oldText = $this->mArticle->fetchRevisionText(
 			$db->timestamp( $this->edittime ),
 			'rev_timestamp' );
-- 
2.20.1