jenkins-bot has submitted this change and it was merged.
Change subject: Use ResourceLoader::makeComment to embed page title in wiki
modules
......................................................................
Use ResourceLoader::makeComment to embed page title in wiki modules
It's a bit odd to simply decline to entitle wiki page modules that have '*/' in
their title when the title could simply be escaped.
Change-Id: I4456ae683cdae4a5a5e4a4a731046cadf1d8ee4d
---
M includes/resourceloader/ResourceLoaderWikiModule.php
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Umherirrender: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php
b/includes/resourceloader/ResourceLoaderWikiModule.php
index 2653f76..f275a6b 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -125,10 +125,7 @@
$script = $this->getContent( $title );
if ( strval( $script ) !== '' ) {
$script = $this->validateScriptFile(
$titleText, $script );
- if ( strpos( $titleText, '*/' ) === false ) {
- $scripts .= "/* $titleText */\n";
- }
- $scripts .= $script . "\n";
+ $scripts .= ResourceLoader::makeComment(
$titleText ) . $script . "\n";
}
}
return $scripts;
@@ -162,9 +159,7 @@
if ( !isset( $styles[$media] ) ) {
$styles[$media] = array();
}
- if ( strpos( $titleText, '*/' ) === false ) {
- $style = "/* $titleText */\n" . $style;
- }
+ $style = ResourceLoader::makeComment( $titleText ) .
$style;
$styles[$media][] = $style;
}
return $styles;
--
To view, visit https://gerrit.wikimedia.org/r/125562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4456ae683cdae4a5a5e4a4a731046cadf1d8ee4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
