Initial support for Content Security Policy, disabled by default

[lhc/web/wiklou.git] / includes / skins / Skin.php

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 340bc2f..5dfa7e3 100644 (file)
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -401,12 +401,14 @@ abstract class Skin extends ContextSource {
 
        /**
         * @param array $data
+        * @param string $nonce OutputPage::getCSPNonce()
         * @return string
         */
-       static function makeVariablesScript( $data ) {
+       static function makeVariablesScript( $data, $nonce = null ) {
                if ( $data ) {
                        return ResourceLoader::makeInlineScript(
-                               ResourceLoader::makeConfigSetScript( $data )
+                               ResourceLoader::makeConfigSetScript( $data ),
+                               $nonce
                        );
                } else {
                        return '';