From cdfd80a38bf5053827ab733aecd0ec3c8efb3bbf Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 30 Jul 2004 20:43:59 +0000 Subject: [PATCH] Correct typo that broke edit conflict screen --- includes/EditPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.20.1