X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderClientHtml.php;h=8d0836640feb364f0f2cf83fc44ef78f29e27565;hb=fc17ad555c430ece410264ecbd2d425765e720d1;hp=b9ff7325ac8b980a30dffa701d20665aec079d0c;hpb=474daae531738ff6b517ccfffbdaf850512e871b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index b9ff7325ac..8d0836640f 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -95,7 +95,6 @@ class ResourceLoaderClientHtml {
 	/**
 	 * Ensure the styles of one or more modules are loaded.
 	 *
-	 * @deprecated since 1.28
 	 * @param array $modules Array of module names
 	 */
 	public function setModuleStyles( array $modules ) {
@@ -406,7 +405,8 @@ class ResourceLoaderClientHtml {
 	 * @param array $modules One or more module names
 	 * @param string $only ResourceLoaderModule TYPE_ class constant
 	 * @param array $extraQuery [optional] Array with extra query parameters for the request
-	 * @param string $nonce [optional] Content-Security-Policy nonce (from OutputPage::getCSPNonce)
+	 * @param string|null $nonce [optional] Content-Security-Policy nonce
+	 *  (from OutputPage::getCSPNonce)
 	 * @return string|WrappedStringList HTML
 	 */
 	public static function makeLoad( ResourceLoaderContext $mainContext, array $modules, $only,