From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 8 May 2019 17:48:33 +0000 (+0000)
Subject: Merge "HTML escape parameter 'text' of hook 'SkinEditSectionLinks'"
X-Git-Tag: 1.34.0-rc.0~1763
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a3cd158d8433e41cbeb299f0e268dfef363b2afd;hp=-c

Merge "HTML escape parameter 'text' of hook 'SkinEditSectionLinks'"
---

a3cd158d8433e41cbeb299f0e268dfef363b2afd
diff --combined includes/skins/Skin.php
index 420c4cbd14,4f04278567..a34e83330e
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@@ -755,10 -755,7 +755,10 @@@ abstract class Skin extends ContextSour
  			return $subpages;
  		}
  
 -		if ( $out->isArticle() && MWNamespace::hasSubpages( $title->getNamespace() ) ) {
 +		if (
 +			$out->isArticle() && MediaWikiServices::getInstance()->getNamespaceInfo()->
 +				hasSubpages( $title->getNamespace() )
 +		) {
  			$ptext = $title->getPrefixedText();
  			if ( strpos( $ptext, '/' ) !== false ) {
  				$links = explode( '/', $ptext );
@@@ -1623,7 -1620,7 +1623,7 @@@
  
  		$links = [
  			'editsection' => [
- 				'text' => $this->msg( 'editsection' )->inLanguage( $lang )->escaped(),
+ 				'text' => $this->msg( 'editsection' )->inLanguage( $lang )->text(),
  				'targetTitle' => $nt,
  				'attribs' => $attribs,
  				'query' => [ 'action' => 'edit', 'section' => $section ],
@@@ -1639,7 -1636,7 +1639,7 @@@
  		foreach ( $links as $k => $linkDetails ) {
  			$linksHtml[] = Linker::link(
  				$linkDetails['targetTitle'],
- 				$linkDetails['text'],
+ 				htmlspecialchars( $linkDetails['text'] ),
  				$linkDetails['attribs'],
  				$linkDetails['query'],
  				$linkDetails['options']