aboutsummaryrefslogtreecommitdiffstats
path: root/includes/ContentSecurityPolicy.php
diff options
context:
space:
mode:
authorHolger Knust <hknust@wikimedia.org>2020-04-07 17:38:17 -0400
committerKrinkle <krinklemail@gmail.com>2020-04-14 03:25:19 +0000
commit471d2371ab1b99ea679fe2d773b900c3903b8bc6 (patch)
treea7dc70f9eabb18d726834ae17296889d83d28f4b /includes/ContentSecurityPolicy.php
parent6b9e09f240eb96a51bb1173cd1e9e31beedd6f7d (diff)
downloadmediawikicore-471d2371ab1b99ea679fe2d773b900c3903b8bc6.tar.gz
mediawikicore-471d2371ab1b99ea679fe2d773b900c3903b8bc6.zip
doxygen: Changed Doxygen tags causing warnings during documentation generation
Updated Doxygen markup in several .php files triggering warnings when mwdocgen.php is executed. Removed obsolete settings MSCGEN_PATH and TCL_SUBST from Doxyfile. The former would generate a warning in 1.8.16 while TCL support was removed in 1.8.18. Since TCL_SUBST was blank anyway, it was removed prior to getting to .18 in production. Increased DOT_GRAPH_MAX_NODES from 50 to 200 since Doxygen complained about it being too low for API and Maintenance. Bug: T248706 Change-Id: I9c67f0807d1b43089d351263d4f591dee5501f36
Diffstat (limited to 'includes/ContentSecurityPolicy.php')
-rw-r--r--includes/ContentSecurityPolicy.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/ContentSecurityPolicy.php b/includes/ContentSecurityPolicy.php
index d3d033379981..70438d9db0ee 100644
--- a/includes/ContentSecurityPolicy.php
+++ b/includes/ContentSecurityPolicy.php
@@ -559,7 +559,7 @@ class ContentSecurityPolicy {
*
* @since 1.35
* @param string $source Source to add.
- * e.g. blob:, example.com, https://*.example.com, example.com/foo
+ * e.g. blob:, *.example.com, %https://example.com, example.com/foo
*/
public function addDefaultSrc( $source ) {
$this->extraDefaultSrc[] = $this->prepareUrlForCSP( $source );
@@ -573,7 +573,7 @@ class ContentSecurityPolicy {
*
* @since 1.35
* @param string $source Source to add.
- * e.g. blob:, example.com, https://*.example.com, example.com/foo
+ * e.g. blob:, *.example.com, %https://example.com, example.com/foo
*/
public function addStyleSrc( $source ) {
$this->extraStyleSrc[] = $this->prepareUrlForCSP( $source );
@@ -588,7 +588,7 @@ class ContentSecurityPolicy {
* @since 1.35
* @warning Be careful including external scripts, as they can take over accounts.
* @param string $source Source to add.
- * e.g. blob:, example.com, https://*.example.com, example.com/foo
+ * e.g. blob:, *.example.com, %https://example.com, example.com/foo
*/
public function addScriptSrc( $source ) {
$this->extraScriptSrc[] = $this->prepareUrlForCSP( $source );