From: Reedy <reedy@wikimedia.org>
Date: Fri, 20 Jul 2018 20:02:40 +0000 (+0100)
Subject: Explicitly mark Skin::makeVariablesScript() public
X-Git-Tag: 1.34.0-rc.0~4687^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=87ec822c343ca246bcea7369f271092991395702;p=lhc%2Fweb%2Fwiklou.git

Explicitly mark Skin::makeVariablesScript() public

Remove else. If contains an unconditional return

Change-Id: I57a04339395d947dffbc3595d321106d4fd8256c
---

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index b6de5108ac..ff2a9eafe9 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -401,15 +401,14 @@ abstract class Skin extends ContextSource {
 	 * @param string|null $nonce OutputPage::getCSPNonce()
 	 * @return string|WrappedString HTML
 	 */
-	static function makeVariablesScript( $data, $nonce = null ) {
+	public static function makeVariablesScript( $data, $nonce = null ) {
 		if ( $data ) {
 			return ResourceLoader::makeInlineScript(
 				ResourceLoader::makeConfigSetScript( $data ),
 				$nonce
 			);
-		} else {
-			return '';
 		}
+		return '';
 	}
 
 	/**