http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58245
Revision: 58245
Author: aaron
Date: 2009-10-28 06:37:51 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
bug 21282 &unhide=1 on next/prev diff links if already viewing the diff
Modified Paths:
--------------
trunk/phase3/includes/Article.php
trunk/phase3/includes/diff/DifferenceInterface.php
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2009-10-28 05:20:17 UTC (rev 58244)
+++ trunk/phase3/includes/Article.php 2009-10-28 06:37:51 UTC (rev 58245)
@@ -3370,6 +3370,11 @@
return;
}
+ # Cascade unhide param in links for easy deletion browsing
+ $extraParams = array();
+ if( $wgRequest->getVal('unhide') ) {
+ $extraParams['unhide'] = 1;
+ }
$revision = Revision::newFromId( $oldid );
$current = ( $oldid == $this->mLatest );
@@ -3383,7 +3388,7 @@
$this->mTitle,
wfMsgHtml( 'currentrevisionlink' ),
array(),
- array(),
+ $extraParams,
array( 'known', 'noclasses' )
);
$curdiff = $current
@@ -3395,7 +3400,7 @@
array(
'diff' => 'cur',
'oldid' => $oldid
- ),
+ ) + $extraParams,
array( 'known', 'noclasses' )
);
$prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
@@ -3407,7 +3412,7 @@
array(
'direction' => 'prev',
'oldid' => $oldid
- ),
+ ) + $extraParams,
array( 'known', 'noclasses' )
)
: wfMsgHtml( 'previousrevision' );
@@ -3419,7 +3424,7 @@
array(
'diff' => 'prev',
'oldid' => $oldid
- ),
+ ) + $extraParams,
array( 'known', 'noclasses' )
)
: wfMsgHtml( 'diff' );
@@ -3432,7 +3437,7 @@
array(
'direction' => 'next',
'oldid' => $oldid
- ),
+ ) + $extraParams,
array( 'known', 'noclasses' )
);
$nextdiff = $current
@@ -3444,7 +3449,7 @@
array(
'diff' => 'next',
'oldid' => $oldid
- ),
+ ) + $extraParams,
array( 'known', 'noclasses' )
);
Modified: trunk/phase3/includes/diff/DifferenceInterface.php
===================================================================
--- trunk/phase3/includes/diff/DifferenceInterface.php 2009-10-28 05:20:17 UTC
(rev 58244)
+++ trunk/phase3/includes/diff/DifferenceInterface.php 2009-10-28 06:37:51 UTC
(rev 58245)
@@ -273,7 +273,10 @@
# Make "previous revision link"
$query['diff'] = 'prev';
$query['oldid'] = $this->mOldid;
-
+ # Cascade unhide param in links for easy deletion browsing
+ if( $this->unhide ) {
+ $query['unhide'] = 1;
+ }
$prevlink = $sk->link(
$this->mTitle,
wfMsgHtml( 'previousdiff' ),
@@ -286,10 +289,11 @@
'noclasses'
)
);
+
# Make "next revision link"
$query['diff'] = 'next';
$query['oldid'] = $this->mNewid;
-
+ # Skip next link on the top revision
if( $this->mNewRev->isCurrent() ) {
$nextlink = ' ';
} else {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
