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

Resolve required parameter after optional in Xml

Change-Id: If04d3b347ec2839b986d8fe85d3f2ed392fc83ed
---

diff --git a/includes/Xml.php b/includes/Xml.php
index 4f2720ed85..af38740a8c 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -124,11 +124,11 @@ class Xml {
 	 * content you have is already valid xml.
 	 *
 	 * @param string $element Element name
-	 * @param array $attribs Array of attributes
+	 * @param array|null $attribs Array of attributes
 	 * @param string $contents Content of the element
 	 * @return string
 	 */
-	public static function tags( $element, $attribs = null, $contents ) {
+	public static function tags( $element, $attribs, $contents ) {
 		return self::openElement( $element, $attribs ) . $contents . "</$element>";
 	}