X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FHtml.php;h=ad0130bf8f0dfc28e0a791b4132330174c848a50;hb=53a18d12949029f365d7de7d24d12e61333513a1;hp=0016426f5498e168626eaf320181fb2a0f383f26;hpb=3aa8c6a332ea90c9d1efeb5341aa323f1316d915;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Html.php b/includes/Html.php
index 0016426f54..ad0130bf8f 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -557,7 +557,7 @@ class Html {
 	 * literal "</script>" or (for XML) literal "]]>".
 	 *
 	 * @param string $contents JavaScript
-	 * @param string $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
+	 * @param string|null $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
 	 * @return string Raw HTML
 	 */
 	public static function inlineScript( $contents, $nonce = null ) {
@@ -565,7 +565,7 @@ class Html {
 		if ( $nonce !== null ) {
 			$attrs['nonce'] = $nonce;
 		} else {
-			if ( ContentSecurityPolicy::isEnabled( RequestContext::getMain()->getConfig() ) ) {
+			if ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
 				wfWarn( "no nonce set on script. CSP will break it" );
 			}
 		}
@@ -582,7 +582,7 @@ class Html {
 	 * "<script src=foo.js></script>".
 	 *
 	 * @param string $url
-	 * @param string $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
+	 * @param string|null $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
 	 * @return string Raw HTML
 	 */
 	public static function linkedScript( $url, $nonce = null ) {
@@ -590,7 +590,7 @@ class Html {
 		if ( $nonce !== null ) {
 			$attrs['nonce'] = $nonce;
 		} else {
-			if ( ContentSecurityPolicy::isEnabled( RequestContext::getMain()->getConfig() ) ) {
+			if ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
 				wfWarn( "no nonce set on script. CSP will break it" );
 			}
 		}