We're a bit behind on code review, so I've gone ahead and de-merged this branch merge for the moment. Sorry. :)

Once we're caught up we can review that and bring it back in... might be best to wait until after 1.10 branch since that's coming up in two weeks.

Two very very minor notes on this for when it goes back in:

From includes/Article.php :

• # Flag to hide all contents of the archived revisions
  

• $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed('deleterevision');
  

... snip ...

• if ( $wgUser->isAllowed( 'deleterevision' ) ) {
  

• 	$supress = "<tr><td>&nbsp;</td><td>";
  

• 	$supress .= Xml::checkLabel( wfMsg( 'revdelete-suppress' ), 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '2' ) );
  

• 	$supress .= "</td></tr>";
  

• } else {
  

• 	$supress = '';
  

• }
  

I know these are in different functions, but can they maybe please have totally different variable names (i.e. PHP doesn't care, but '$suppress' and '$supress' with only one 'p' difference increases the chance of a human typing the wrong name, or being confused about the purpose of the variable).

Also:

• var $curlink , $difflink, $lastlink , $usertalklink , $versionlink ;

• var $curlinks, $difflink, $lastlink , $usertalklink , $versionlink ;

The string '$curlinks' did not seem to used anywhere else in the diff.

All the best, Nick.