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 b6de510..ff2a9ea 100644 (file)
--- 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
         */
         * @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
                        );
                if ( $data ) {
                        return ResourceLoader::makeInlineScript(
                                ResourceLoader::makeConfigSetScript( $data ),
                                $nonce
                        );

-               } else {
-                       return '';

                }
                }

+               return '';

        }
 
        /**
        }
 
        /**