}
/**
- * @param string $str
- * @warning You should never use this method. I18n messages should be escaped
- * @deprecated 1.32 Use ->msg() or ->msgWiki() instead.
- * @suppress SecurityCheck-XSS
- * @return-taint exec_html
+ * @deprecated since 1.33 Use ->msg() or ->getMsg() instead.
*/
- function msgHtml( $str ) {
- wfDeprecated( __METHOD__, '1.32' );
- echo $this->getMsg( $str )->text();
- }
-
function msgWiki( $str ) {
+ // TODO: Add wfDeprecated( __METHOD__, '1.33' ) after 1.33 got released
echo $this->getMsg( $str )->parseAsBlock();
}
$boxes[$boxName]['content'] = $content;
}
}
- } else {
- if ( $hookContents ) {
- $boxes['TOOLBOXEND'] = [
- 'id' => 'p-toolboxend',
- 'header' => $boxes['TOOLBOX']['header'],
- 'generated' => false,
- 'content' => "<ul>{$hookContents}</ul>",
- ];
- // HACK: Make sure that TOOLBOXEND is sorted next to TOOLBOX
- $boxes2 = [];
- foreach ( $boxes as $key => $box ) {
- if ( $key === 'TOOLBOXEND' ) {
- continue;
- }
- $boxes2[$key] = $box;
- if ( $key === 'TOOLBOX' ) {
- $boxes2['TOOLBOXEND'] = $boxes['TOOLBOXEND'];
- }
+ } elseif ( $hookContents ) {
+ $boxes['TOOLBOXEND'] = [
+ 'id' => 'p-toolboxend',
+ 'header' => $boxes['TOOLBOX']['header'],
+ 'generated' => false,
+ 'content' => "<ul>{$hookContents}</ul>",
+ ];
+ // HACK: Make sure that TOOLBOXEND is sorted next to TOOLBOX
+ $boxes2 = [];
+ foreach ( $boxes as $key => $box ) {
+ if ( $key === 'TOOLBOXEND' ) {
+ continue;
+ }
+ $boxes2[$key] = $box;
+ if ( $key === 'TOOLBOX' ) {
+ $boxes2['TOOLBOXEND'] = $boxes['TOOLBOXEND'];
}
- $boxes = $boxes2;
- // END hack
}
+ $boxes = $boxes2;
+ // END hack
}
return $boxes;