Index: Article.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Article.php,v
retrieving revision 1.185
diff -u -r1.185 Article.php
--- Article.php 31 Jul 2004 21:23:14 -0000 1.185
+++ Article.php 1 Aug 2004 10:32:21 -0000
@@ -1617,6 +1617,8 @@
# Save it!
$newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
+ if ( $rollbackComment = $wgRequest->getText( 'wpReasonRollback' ) )
+ $newcomment .= " -> ".htmlspecialchars($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 1 Aug 2004 10:32:23 -0000
@@ -27,7 +27,7 @@
$wgOut->setArticleFlag( false );
if ( ! $this->loadText() ) {
- $wgOut->setPagetitle( wfMsg( "errorpagetitle" ) );
+ $wgOut->setPagetitle( wfMsg( "errorpagetitle" ) );
$wgOut->addHTML( $mtext );
wfProfileOut( $fname );
return;
@@ -68,18 +68,39 @@
"target=" . urlencode($this->mOldUser) );
$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) ) . "]";
- } else {
- $rollback = "";
+ $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
+ $wgOut->addHTML( "
+".ucFirst( wfMsg( "rollbacklink" ) ).":
+Do you really want to rollback this page?
+
\n" );
}
- $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)
";
+
DifferenceEngine::showDiff( $this->mOldtext, $this->mNewtext,
$oldHeader, $newHeader );
$wgOut->addHTML( "
{$this->mNewtitle}
\n" );
@@ -98,7 +119,7 @@
htmlspecialchars( $ntext ) ) );
$wgOut->addHTML( "
+cellpadding='0' cellspacing='4px' class='diff'>
{$otitle} |
|