\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'subcat' );
$r .= $this->formatList( $this->children, $this->children_start_char );
@@ -383,7 +383,7 @@ class CategoryViewer extends ContextSource {
* @return string
*/
function getPagesSection() {
- $ti = htmlspecialchars( $this->title->getText() );
+ $ti = wfEscapeWikiText( $this->title->getText() );
# Don't show articles section if there are none.
$r = '';
@@ -398,7 +398,7 @@ class CategoryViewer extends ContextSource {
if ( $rescnt > 0 ) {
$r = "
\n";
- $r .= '
' . wfMsg( 'category_header', $ti ) . "
\n";
+ $r .= '
' . $this->msg( 'category_header', $ti )->text() . "
\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'page' );
$r .= $this->formatList( $this->articles, $this->articles_start_char );
@@ -419,7 +419,7 @@ class CategoryViewer extends ContextSource {
$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' );
$r .= "
\n";
- $r .= '
' . wfMsg( 'category-media-header', htmlspecialchars( $this->title->getText() ) ) . "
\n";
+ $r .= '' . $this->msg( 'category-media-header', wfEscapeWikiText( $this->title->getText() ) )->text() . "
\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'file' );
if ( $this->showGallery ) {
@@ -576,7 +576,7 @@ class CategoryViewer extends ContextSource {
* @return String HTML
*/
private function pagingLinks( $first, $last, $type = '' ) {
- $prevLink = wfMessage( 'prevn' )->numParams( $this->limit )->escaped();
+ $prevLink = $this->msg( 'prevn' )->numParams( $this->limit )->escaped();
if ( $first != '' ) {
$prevQuery = $this->query;
@@ -590,7 +590,7 @@ class CategoryViewer extends ContextSource {
);
}
- $nextLink = wfMessage( 'nextn' )->numParams( $this->limit )->escaped();
+ $nextLink = $this->msg( 'nextn' )->numParams( $this->limit )->escaped();
if ( $last != '' ) {
$lastQuery = $this->query;
@@ -604,7 +604,7 @@ class CategoryViewer extends ContextSource {
);
}
- return "($prevLink) ($nextLink)";
+ return $this->msg('categoryviewer-pagedlinks')->rawParams($prevLink, $nextLink)->escaped();
}
/**
@@ -688,8 +688,8 @@ class CategoryViewer extends ContextSource {
$this->cat->refreshCounts();
} else {
# Case 3: hopeless. Don't give a total count at all.
- return wfMessage( "category-$type-count-limited" )->numParams( $rescnt )->parseAsBlock();
+ return $this->msg( "category-$type-count-limited" )->numParams( $rescnt )->parseAsBlock();
}
- return wfMessage( "category-$type-count" )->numParams( $rescnt, $totalcnt )->parseAsBlock();
+ return $this->msg( "category-$type-count" )->numParams( $rescnt, $totalcnt )->parseAsBlock();
}
}