Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trivial cosmetic anal-retentive adjustment to four wfDebug() edit-conflict debugging messages.

Browse source
This commit is contained in:
Nick Jenkins 2007-07-25 01:53:04 +00:00
parent 130e9f8199
commit 8a9846b6ec
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/EditPage.php
View file

@ -792,7 +792,7 @@ class EditPage {
if ( $this->isConflict) { if ( $this->isConflict) {
wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" . wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" .
$this->mArticle->getTimestamp() . "'\n" ); $this->mArticle->getTimestamp() . "')\n" );
$text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime); $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime);
} }
else { else {
@ -807,7 +807,7 @@ class EditPage {
# Suppress edit conflict with self, except for section edits where merging is required. # Suppress edit conflict with self, except for section edits where merging is required.
if ( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) { if ( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
wfDebug( "Suppressing edit conflict, same user.\n" ); wfDebug( "EditPage::editForm Suppressing edit conflict, same user.\n" );
$this->isConflict = false; $this->isConflict = false;
} else { } else {
# switch from section editing to normal editing in edit conflict # switch from section editing to normal editing in edit conflict
@ -816,11 +816,11 @@ class EditPage {
if( $this->mergeChangesInto( $text ) ){ if( $this->mergeChangesInto( $text ) ){
// Successful merge! Maybe we should tell the user the good news? // Successful merge! Maybe we should tell the user the good news?
$this->isConflict = false; $this->isConflict = false;
wfDebug( "Suppressing edit conflict, successful merge.\n" ); wfDebug( "EditPage::editForm Suppressing edit conflict, successful merge.\n" );
} else { } else {
$this->section = ''; $this->section = '';
$this->textbox1 = $text; $this->textbox1 = $text;
wfDebug( "Keeping edit conflict, failed merge.\n" ); wfDebug( "EditPage::editForm Keeping edit conflict, failed merge.\n" );
} }
} }
} }