r72424 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72423‎ | r72424 | r72425 >
Date:13:21, 5 September 2010
Author:platonides
Status:ok
Tags:
Comment:
(bug 24977) Remove the duplicate Access Key to compare selected revision in history
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/HistoryPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/HistoryPage.php
@@ -380,15 +380,19 @@
381381 $s .= Html::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
382382 $s .= Html::hidden( 'action', 'historysubmit' ) . "\n";
383383
 384+ $s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions'),
 385+ array( 'class' => 'historysubmit' ) ) . "\n";
 386+
384387 $this->buttons = '<div>';
385388 $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
386389 array( 'class' => 'historysubmit' )
387390 + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
388391 ) . "\n";
 392+
389393 if( $wgUser->isAllowed('deleterevision') ) {
390394 $float = $wgContLang->alignEnd();
391395 # Note bug #20966, <button> is non-standard in IE<8
392 - $this->buttons .= Html::element( 'button',
 396+ $element = Html::element( 'button',
393397 array(
394398 'type' => 'submit',
395399 'name' => 'revisiondelete',
@@ -398,11 +402,13 @@
399403 ),
400404 wfMsg( 'showhideselectedversions' )
401405 ) . "\n";
 406+ $s .= $element;
 407+ $this->buttons .= $element;
402408 }
403409 if( $wgUser->isAllowed( 'revisionmove' ) ) {
404410 $float = $wgContLang->alignEnd();
405411 # Note bug #20966, <button> is non-standard in IE<8
406 - $this->buttons .= Html::element( 'button',
 412+ $element = Html::element( 'button',
407413 array(
408414 'type' => 'submit',
409415 'name' => 'revisionmove',
@@ -412,9 +418,11 @@
413419 ),
414420 wfMsg( 'revisionmoveselectedversions' )
415421 ) . "\n";
 422+ $s .= $element;
 423+ $this->buttons .= $element;
416424 }
417425 $this->buttons .= '</div>';
418 - $s .= $this->buttons . '<ul id="pagehistory">' . "\n";
 426+ $s .= '</div><ul id="pagehistory">' . "\n";
419427 return $s;
420428 }
421429
Index: trunk/phase3/RELEASE-NOTES
@@ -312,6 +312,8 @@
313313 * (bug 20744) Wiki forgets about an uploaded file
314314 * (bug 17913) Don't show "older edit" when no older edit available
315315 * (bug 6204) TOC not properly rendered when using $wgMaxTocLevel
 316+* (bug 24977) The accesskey in history page now lead directly to the diff
 317+ instead of alterning focus between the two buttons.
316318
317319 === API changes in 1.17 ===
318320 * (bug 22738) Allow filtering by action type on query=logevent.

Status & tagging log