Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 6 insertions, 1 deletions

diff --git a/extensions/Gadgets/SpecialGadgets.php b/extensions/Gadgets/SpecialGadgets.php
index f6c3d74c..3cbce480 100644
--- a/extensions/Gadgets/SpecialGadgets.php
+++ b/extensions/Gadgets/SpecialGadgets.php
@@ -106,7 +106,8 @@ class SpecialGadgets extends SpecialPage {
 					$output->addHTML( Xml::openElement( 'ul' ) );
 				}
 
-				$lnk = '  ' . $this->msg( 'parentheses', $lang->pipeList( $links ) )->text();
+				$lnk = '  ' .
+					$this->msg( 'parentheses' )->rawParams( $lang->pipeList( $links ) )->escaped();
 				$output->addHTML( Xml::openElement( 'li' ) .
 						$ttext . $lnk . "<br />" .
 						$this->msg( 'gadgets-uses' )->escaped() .
@@ -201,4 +202,8 @@ class SpecialGadgets extends SpecialPage {
 			. Html::closeElement( 'form' )
 		);
 	}
+
+	protected function getGroupName() {
+		return 'wiki';
+	}
 }