| Index: trunk/phase3/includes/specials/SpecialAllpages.php |
| — | — | @@ -409,7 +409,7 @@ |
| 410 | 410 | $nsForm . |
| 411 | 411 | '</td> |
| 412 | 412 | <td class="mw-allpages-nav">' . |
| 413 | | - $sk->link( $self, wfMsgHtml ( 'allpages' ), array(), array(), 'known' ); |
| | 413 | + $sk->link( $self, wfMsgHtml ( 'allpages' ) ); |
| 414 | 414 | |
| 415 | 415 | # Do we put a previous link ? |
| 416 | 416 | if( isset( $prevTitle ) && $pt = $prevTitle->getText() ) { |
| — | — | @@ -420,7 +420,7 @@ |
| 421 | 421 | |
| 422 | 422 | $prevLink = $sk->linkKnown( |
| 423 | 423 | $self, |
| 424 | | - htmlspecialchars( wfMsg( 'prevpage', $pt ) ), |
| | 424 | + wfMessage( 'prevpage', $pt )->escaped(), |
| 425 | 425 | array(), |
| 426 | 426 | $query |
| 427 | 427 | ); |
| — | — | @@ -437,7 +437,7 @@ |
| 438 | 438 | |
| 439 | 439 | $nextLink = $sk->linkKnown( |
| 440 | 440 | $self, |
| 441 | | - htmlspecialchars( wfMsg( 'nextpage', $t->getText() ) ), |
| | 441 | + wfMessage( 'nextpage', $t->getText() )->escaped(), |
| 442 | 442 | array(), |
| 443 | 443 | $query |
| 444 | 444 | ); |
| — | — | @@ -447,19 +447,17 @@ |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | $wgOut->addHTML( $out2 . $out ); |
| 451 | | - if( isset($prevLink) or isset($nextLink) ) { |
| 452 | | - $wgOut->addHTML( '<hr /><p class="mw-allpages-nav">' ); |
| 453 | | - if( isset( $prevLink ) ) { |
| 454 | | - $wgOut->addHTML( $prevLink ); |
| 455 | | - } |
| 456 | | - if( isset( $prevLink ) && isset( $nextLink ) ) { |
| 457 | | - $wgOut->addHTML( wfMsgExt( 'pipe-separator' , 'escapenoentities' ) ); |
| 458 | | - } |
| 459 | | - if( isset( $nextLink ) ) { |
| 460 | | - $wgOut->addHTML( $nextLink ); |
| 461 | | - } |
| 462 | | - $wgOut->addHTML( '</p>' ); |
| 463 | 451 | |
| | 452 | + $links = array(); |
| | 453 | + if ( isset( $prevLink ) ) $links[] = $prevLink; |
| | 454 | + if ( isset( $nextLink ) ) $links[] = $nextLink; |
| | 455 | + |
| | 456 | + if ( count( $links ) ) { |
| | 457 | + $wgOut->addHTML( |
| | 458 | + Html::element( 'hr' ) . |
| | 459 | + Html::rawElement( 'div', array( 'class' => 'mw-allpages-nav' ), |
| | 460 | + $wgLang->pipeList( $links ) |
| | 461 | + ) ); |
| 464 | 462 | } |
| 465 | 463 | |
| 466 | 464 | } |