From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Fri, 8 Jun 2018 21:32:55 +0000 (-0700)
Subject: Resolve required parameter after optional parameter in Linker
X-Git-Tag: 1.34.0-rc.0~5140^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=3a565d6b175438e9de0537f608df571ac84cb584;p=lhc%2Fweb%2Fwiklou.git

Resolve required parameter after optional parameter in Linker

Change-Id: I2569e30922e93404a59fa282df8ae8d3d19912fd
---

diff --git a/includes/DummyLinker.php b/includes/DummyLinker.php
index 9aa6aeb056..7958420933 100644
--- a/includes/DummyLinker.php
+++ b/includes/DummyLinker.php
@@ -107,7 +107,7 @@ class DummyLinker {
 		Title $title,
 		$file,
 		$label = '',
-		$alt,
+		$alt = '',
 		$align = 'right',
 		$params = [],
 		$framed = false,
diff --git a/includes/Linker.php b/includes/Linker.php
index 3ee442d104..663412798d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -504,7 +504,7 @@ class Linker {
 	 * @param string $manualthumb
 	 * @return string
 	 */
-	public static function makeThumbLinkObj( Title $title, $file, $label = '', $alt,
+	public static function makeThumbLinkObj( Title $title, $file, $label = '', $alt = '',
 		$align = 'right', $params = [], $framed = false, $manualthumb = ""
 	) {
 		$frameParams = [
diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index 160d2d111d..87d7e0a4a7 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -245,7 +245,7 @@ class LinkRenderer {
 	 * @return string
 	 */
 	public function makePreloadedLink(
-		LinkTarget $target, $text = null, $classes, array $extraAttribs = [], array $query = []
+		LinkTarget $target, $text = null, $classes = '', array $extraAttribs = [], array $query = []
 	) {
 		// Run begin hook
 		$ret = $this->runBeginHook( $target, $text, $extraAttribs, $query, true );