X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fskins%2FBaseTemplate.php;h=8d5ce10dd1cb018104199352269b86f16dc939ee;hp=0b7fc2f5d34023acc57a91bf6ef729ad4edb008f;hb=a8a5f03b3b6653136c4dc5925d6bb2b806010725;hpb=b5e0337ddb857bf2f7a37aa7b7ba1b081a578e8c diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php index 0b7fc2f5d3..8d5ce10dd1 100644 --- a/includes/skins/BaseTemplate.php +++ b/includes/skins/BaseTemplate.php @@ -29,7 +29,7 @@ abstract class BaseTemplate extends QuickTemplate { * Get a Message object with its context set * * @param string $name Message name - * @param ... $params Message params + * @param mixed $params,... Message params * @return Message */ public function getMsg( $name /* ... */ ) { @@ -201,13 +201,13 @@ abstract class BaseTemplate extends QuickTemplate { ]; break; case 'LANGUAGES': - if ( $this->data['language_urls'] ) { + if ( $this->data['language_urls'] !== false ) { $msgObj = $this->getMsg( 'otherlanguages' ); $boxes[$boxName] = [ 'id' => 'p-lang', 'header' => $msgObj->exists() ? $msgObj->text() : 'otherlanguages', 'generated' => false, - 'content' => $this->data['language_urls'], + 'content' => $this->data['language_urls'] ?: [], ]; } break; @@ -678,7 +678,7 @@ abstract class BaseTemplate extends QuickTemplate { } foreach ( $validFooterIcons as $blockName => $footerIcons ) { $html .= Html::openElement( 'div', [ - 'id' => 'f-' . Sanitizer::escapeId( $blockName ) . 'ico', + 'id' => Sanitizer::escapeIdForAttribute( "f-{$blockName}ico" ), 'class' => 'footer-icons' ] ); foreach ( $footerIcons as $icon ) { @@ -691,7 +691,7 @@ abstract class BaseTemplate extends QuickTemplate { foreach ( $validFooterLinks as $aLink ) { $html .= Html::rawElement( 'li', - [ 'id' => Sanitizer::escapeId( $aLink ) ], + [ 'id' => Sanitizer::escapeIdForAttribute( $aLink ) ], $this->get( $aLink ) ); } @@ -734,7 +734,7 @@ abstract class BaseTemplate extends QuickTemplate { $out .= Html::rawElement( 'div', [ - 'id' => Sanitizer::escapeId( "mw-indicator-$id" ), + 'id' => Sanitizer::escapeIdForAttribute( "mw-indicator-$id" ), 'class' => 'mw-indicator', ], $content