Index: DifferenceEngine.php
===================================================================
--- DifferenceEngine.php (revision 18323)
+++ DifferenceEngine.php (working copy)
@@ -523,21 +523,17 @@
$newLink = $this->mNewPage->escapeLocalUrl();
$this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
$newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' );
- $newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undo=' . $this->mNewid );
$this->mNewtitle = "{$this->mPagetitle} ($timestamp)"
- . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")"
- . " (" . htmlspecialchars( wfMsg( 'editundo' ) ) . ")";
+ . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")";
} else {
$newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
$newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid );
- $newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undo=' . $this->mNewid );
$this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp ) );
$this->mNewtitle = "{$this->mPagetitle}"
- . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")"
- . " (" . htmlspecialchars( wfMsg( 'editundo' ) ) . ")";
+ . " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")";
}
// Load the old revision object
@@ -568,6 +564,9 @@
$oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid );
$this->mOldtitle = "" . htmlspecialchars( wfMsg( 'revisionasof', $t ) )
. " (" . htmlspecialchars( wfMsg( 'editold' ) ) . ")";
+ //now that we considered old rev, we can make undo link (bug 8133, multi-edit undo)
+ $newUndo = $this->mNewPage->escapeLocalUrl( 'action=edit&undoafter=' . $this->mOldid . '&undoto=' . $this->mNewid);
+ $this->mNewtitle .= " (" . htmlspecialchars( wfMsg( 'editundo' ) ) . ")";
}
return true;