Index: Article.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Article.php,v
retrieving revision 1.184
diff -u -r1.184 Article.php
--- Article.php 24 Jul 2004 07:24:03 -0000 1.184
+++ Article.php 31 Jul 2004 19:17:28 -0000
@@ -453,7 +453,6 @@
if ( 0 == $id ) {
return false;
}
-
$s = $dbr->getArray( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname );
if ( $s === false ) {
return false;
@@ -1613,6 +1612,8 @@
# Save it!
$newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
+ if ($rollbackComment = urldecode( $wgRequest->getVal( 'comment' ) ))
+ $newcomment .= " -> ".$rollbackComment;
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->addHTML( '
' . $newcomment . "
\n
\n" );
Index: DifferenceEngine.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/DifferenceEngine.php,v
retrieving revision 1.25
diff -u -r1.25 DifferenceEngine.php
--- DifferenceEngine.php 18 Jul 2004 08:48:25 -0000 1.25
+++ DifferenceEngine.php 31 Jul 2004 19:17:31 -0000
@@ -69,17 +69,22 @@
$newContribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, "Contributions" ), $contribs,
"target=" . urlencode($this->mNewUser) );
if ( !$this->mNewid && $wgUser->isSysop() ) {
- $rollback = " [" . $sk->makeKnownLinkObj( $wgTitle, wfMsg( "rollbacklink" ),
- "action=rollback&from=" . urlencode($this->mNewUser) ) . "]";
+ $rollback = "";
} else {
- $rollback = "";
+ $rollback = "";
}
- $oldHeader = "{$this->mOldtitle}
$oldUserLink ($oldUTLink | $oldContribs)
".
+ $oldHeader = "{$this->mOldtitle}
$oldUserLink ($oldUTLink | $oldContribs)
".
$this->mOldComment;
- $newHeader = "{$this->mNewtitle}
$newUserLink ($newUTLink | $newContribs) $rollback
".
- $this->mNewComment;
-
+ $newHeader = "{$this->mNewtitle}
$newUserLink ($newUTLink | $newContribs)
".
+ $rollback;
+
DifferenceEngine::showDiff( $this->mOldtext, $this->mNewtext,
$oldHeader, $newHeader );
$wgOut->addHTML( "
{$this->mNewtitle}
\n" );
@@ -98,7 +103,7 @@
htmlspecialchars( $ntext ) ) );
$wgOut->addHTML( "
+cellpadding='0' cellspacing='4px' class='diff'>
{$otitle} |
|