Properly escape the messages in CategoryViewer.php

This mostly reverts commit 8fe8035da2,
and redoes it without escaping the parser output.

Change-Id: I87da10e63b55c1a6c83dd497e30f65ad224e052b
This commit is contained in:
Jackmcbarn 2015-02-05 21:38:02 +00:00
parent 8fe8035da2
commit 98cdb56c72

View file

@ -387,16 +387,13 @@ class CategoryViewer extends ContextSource {
if ( $rescnt > 0 ) {
# Showing subcategories
$r .= Html::openElement( 'div', array( 'id' => 'mw-subcategories' ) );
$r .= "\n";
$r .= Html::element( 'h2', array(), $this->msg( 'subcategories' )->text() );
$r .= "\n";
$r .= "<div id=\"mw-subcategories\">\n";
$r .= '<h2>' . $this->msg( 'subcategories' )->parse() . "</h2>\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'subcat' );
$r .= $this->formatList( $this->children, $this->children_start_char );
$r .= $this->getSectionPagingLinks( 'subcat' );
$r .= "\n";
$r .= Html::closeElement( 'div' );
$r .= "\n</div>";
}
return $r;
}
@ -419,16 +416,13 @@ class CategoryViewer extends ContextSource {
$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' );
if ( $rescnt > 0 ) {
$r .= Html::openElement( 'div', array( 'id' => 'mw-pages' ) );
$r .= "\n";
$r .= Html::element( 'h2', array(), $this->msg( 'category_header', $ti )->text() );
$r .= "\n";
$r = "<div id=\"mw-pages\">\n";
$r .= '<h2>' . $this->msg( 'category_header', $ti )->parse() . "</h2>\n";
$r .= $countmsg;
$r .= $this->getSectionPagingLinks( 'page' );
$r .= $this->formatList( $this->articles, $this->articles_start_char );
$r .= $this->getSectionPagingLinks( 'page' );
$r .= "\n";
$r .= Html::closeElement( 'div' );
$r .= "\n</div>";
}
return $r;
}