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

Merge "Remove parameter 'options' from hook 'SkinEditSectionLinks'"
---

diff --git a/docs/hooks.txt b/docs/hooks.txt
index b2f1e816b5..e90468dfee 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3068,7 +3068,6 @@ $tooltip: The default tooltip.  Escape before using.
     - text - String for the text
     - attribs - Array of attributes
     - query - Array of query parameters to add to the URL
-    - options - Array of options for Linker::link
 $lang: The language code to use for the link in the wfMessage function
 
 'SkinGetPoweredBy': TODO
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index a34e83330e..86a1c4c94b 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1626,8 +1626,7 @@ abstract class Skin extends ContextSource {
 				'text' => $this->msg( 'editsection' )->inLanguage( $lang )->text(),
 				'targetTitle' => $nt,
 				'attribs' => $attribs,
-				'query' => [ 'action' => 'edit', 'section' => $section ],
-				'options' => [ 'noclasses', 'known' ]
+				'query' => [ 'action' => 'edit', 'section' => $section ]
 			]
 		];
 
@@ -1637,12 +1636,11 @@ abstract class Skin extends ContextSource {
 
 		$linksHtml = [];
 		foreach ( $links as $k => $linkDetails ) {
-			$linksHtml[] = Linker::link(
+			$linksHtml[] = Linker::linkKnown(
 				$linkDetails['targetTitle'],
 				htmlspecialchars( $linkDetails['text'] ),
 				$linkDetails['attribs'],
-				$linkDetails['query'],
-				$linkDetails['options']
+				$linkDetails['query']
 			);
 		}