X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fskins%2FBaseTemplate.php;h=aad676f8e38dabafd9576e41e733b4e04c728658;hp=dc0a7038533f4d8e79134cdfb7e4e0a33deb0a45;hb=d5a7166771613dfe4ed9fb75fa5efeced6134bd1;hpb=b193ef8377c287272a08729bb9cd7b6336880959

diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index dc0a703853..aad676f8e3 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -523,7 +523,6 @@ abstract class BaseTemplate extends QuickTemplate {
 			'type' => 'search',
 			'name' => 'search',
 			'placeholder' => wfMessage( 'searchsuggest-search' )->text(),
-			'value' => $this->get( 'search', '' ),
 		];
 		$realAttrs = array_merge( $realAttrs, Linker::tooltipAndAccesskeyAttribs( 'search' ), $attrs );
 		return Html::element( 'input', $realAttrs );
@@ -679,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 ) {
@@ -692,14 +691,14 @@ abstract class BaseTemplate extends QuickTemplate {
 			foreach ( $validFooterLinks as $aLink ) {
 				$html .= Html::rawElement(
 					'li',
-					[ 'id' => Sanitizer::escapeId( $aLink ) ],
+					[ 'id' => Sanitizer::escapeIdForAttribute( $aLink ) ],
 					$this->get( $aLink )
 				);
 			}
 			$html .= Html::closeElement( 'ul' );
 		}
 
-		$html .= $this->clear() . $footerEnd;
+		$html .= $this->getClear() . $footerEnd;
 
 		return $html;
 	}
@@ -710,7 +709,7 @@ abstract class BaseTemplate extends QuickTemplate {
 	 * @return string html
 	 * @since 1.29
 	 */
-	protected function clear() {
+	protected function getClear() {
 		return Html::element( 'div', [ 'class' => 'visualClear' ] );
 	}
 
@@ -735,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