From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 30 Jul 2004 20:43:59 +0000 (+0000)
Subject: Correct typo that broke edit conflict screen
X-Git-Tag: 1.5.0alpha1~2565
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=cdfd80a38bf5053827ab733aecd0ec3c8efb3bbf;p=lhc%2Fweb%2Fwiklou.git

Correct typo that broke edit conflict screen
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8ec9c1739c..acbdc598a8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -544,7 +544,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 		$fname = 'EditPage::mergeChangesInto';
 		$oldDate = $this->edittime;
 		$dbw =& wfGetDB( DB_MASTER );
-		$obj = $dbr->getArray( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mTitle->getArticleID() ), 
+		$obj = $dbw->getArray( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mTitle->getArticleID() ), 
 			$fname, 'FOR UPDATE' );
 
 		$yourtext = $obj->cur_text;