Correct typo that broke edit conflict screen

This commit is contained in:
Brion Vibber 2004-07-30 20:43:59 +00:00
parent 0b2fb67cd1
commit cdfd80a38b

View file

@ -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;