Reduce the risk of dropping edits during conflict resolution

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 281d18b..0db7343 100644 (file)
--- 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' );