jenkins-bot has submitted this change and it was merged. Change subject: Escape unsafe messages in CategoryViewer.php ......................................................................
Escape unsafe messages in CategoryViewer.php Bug: T85864 GCI: http://www.google-melange.com/gci/task/view/google/gci2014/5811264311787520 Change-Id: Ie59fb389b804f031b761f93f2c91a548742326ab --- M includes/CategoryViewer.php 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php index 1a09d44..c898ec9 100644 --- a/includes/CategoryViewer.php +++ b/includes/CategoryViewer.php @@ -387,13 +387,16 @@ if ( $rescnt > 0 ) { # Showing subcategories - $r .= "<div id=\"mw-subcategories\">\n"; - $r .= '<h2>' . $this->msg( 'subcategories' )->text() . "</h2>\n"; + $r .= Html::openElement( 'div', array( 'id' => 'mw-subcategories' ) ); + $r .= "\n"; + $r .= Html::element( 'h2', array(), $this->msg( 'subcategories' )->text() ); + $r .= "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'subcat' ); $r .= $this->formatList( $this->children, $this->children_start_char ); $r .= $this->getSectionPagingLinks( 'subcat' ); - $r .= "\n</div>"; + $r .= "\n"; + $r .= Html::closeElement( 'div' ); } return $r; } @@ -416,13 +419,16 @@ $countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' ); if ( $rescnt > 0 ) { - $r = "<div id=\"mw-pages\">\n"; - $r .= '<h2>' . $this->msg( 'category_header', $ti )->text() . "</h2>\n"; + $r .= Html::openElement( 'div', array( 'id' => 'mw-pages' ) ); + $r .= "\n"; + $r .= Html::element( 'h2', array(), $this->msg( 'category_header', $ti )->text() ); + $r .= "\n"; $r .= $countmsg; $r .= $this->getSectionPagingLinks( 'page' ); $r .= $this->formatList( $this->articles, $this->articles_start_char ); $r .= $this->getSectionPagingLinks( 'page' ); - $r .= "\n</div>"; + $r .= "\n"; + $r .= Html::closeElement( 'div' ); } return $r; } -- To view, visit https://gerrit.wikimedia.org/r/184226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie59fb389b804f031b761f93f2c91a548742326ab Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Gerrit Patch Uploader <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Scimonster <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
