X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fskins%2FSkin.php;h=a34e83330ed4a0192628122525c3ae6539634971;hp=54dfff30bd6d4b58001246b170ae7d1b794dfa00;hb=a3cd158d8433e41cbeb299f0e268dfef363b2afd;hpb=0c68254dc6e274ef22c40dad71fe64112365f48a

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 54dfff30bd..a34e83330e 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -175,7 +175,6 @@ abstract class Skin extends ContextSource {
 	 */
 	public function getDefaultModules() {
 		$out = $this->getOutput();
-		$config = $this->getConfig();
 		$user = $this->getUser();
 
 		// Modules declared in the $modules literal are loaded
@@ -530,14 +529,14 @@ abstract class Skin extends ContextSource {
 		$colon = $this->msg( 'colon-separator' )->escaped();
 
 		if ( !empty( $allCats['normal'] ) ) {
-			$t = $embed . implode( "{$pop}{$embed}", $allCats['normal'] ) . $pop;
+			$t = $embed . implode( $pop . $embed, $allCats['normal'] ) . $pop;
 
 			$msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) )->escaped();
 			$linkPage = $this->msg( 'pagecategorieslink' )->inContentLanguage()->text();
 			$title = Title::newFromText( $linkPage );
 			$link = $title ? Linker::link( $title, $msg ) : $msg;
 			$s .= '<div id="mw-normal-catlinks" class="mw-normal-catlinks">' .
-				$link . $colon . '<ul>' . $t . '</ul>' . '</div>';
+				$link . $colon . '<ul>' . $t . '</ul></div>';
 		}
 
 		# Hidden categories
@@ -552,7 +551,7 @@ abstract class Skin extends ContextSource {
 
 			$s .= "<div id=\"mw-hidden-catlinks\" class=\"mw-hidden-catlinks$class\">" .
 				$this->msg( 'hidden-categories' )->numParams( count( $allCats['hidden'] ) )->escaped() .
-				$colon . '<ul>' . $embed . implode( "{$pop}{$embed}", $allCats['hidden'] ) . $pop . '</ul>' .
+				$colon . '<ul>' . $embed . implode( $pop . $embed, $allCats['hidden'] ) . $pop . '</ul>' .
 				'</div>';
 		}
 
@@ -756,7 +755,10 @@ abstract class Skin extends ContextSource {
 			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 );
@@ -1525,7 +1527,6 @@ abstract class Skin extends ContextSource {
 	 *   should fall back to the next notice in its sequence
 	 */
 	private function getCachedNotice( $name ) {
-		$needParse = false;
 		$config = $this->getConfig();
 
 		if ( $name === 'default' ) {
@@ -1622,7 +1623,7 @@ abstract class Skin extends ContextSource {
 
 		$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 ],
@@ -1638,7 +1639,7 @@ abstract class Skin extends ContextSource {
 		foreach ( $links as $k => $linkDetails ) {
 			$linksHtml[] = Linker::link(
 				$linkDetails['targetTitle'],
-				$linkDetails['text'],
+				htmlspecialchars( $linkDetails['text'] ),
 				$linkDetails['attribs'],
 				$linkDetails['query'],
 				$linkDetails['options']