jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Fixup 282143067c "Invalid filter" logging
......................................................................
resourceloader: Fixup 282143067c "Invalid filter" logging
Incorrectly started logging "Invalid filter" messages for cases
where the filter is just fine but the content is just empty (harmless).
Change-Id: Ic0df4fb5cffc4cef578f452973d618980666e945
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 64d79e1..456c8c2 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -182,8 +182,12 @@
// Defaults
$options += array( 'cache' => true, 'cacheReport' => true );
- // For empty/whitespace-only data or for unknown filters, don't
do any caching or processing
- if ( trim( $data ) === '' || !in_array( $filter, array(
'minify-js', 'minify-css' ) ) ) {
+ // Don't filter empty content
+ if ( trim( $data ) === '' ) {
+ return $data;
+ }
+
+ if ( !in_array( $filter, array( 'minify-js', 'minify-css' ) ) )
{
wfDebugLog( 'resourceloader', __METHOD__ . ": Invalid
filter: $filter" );
return $data;
}
--
To view, visit https://gerrit.wikimedia.org/r/211889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0df4fb5cffc4cef578f452973d618980666e945
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf6
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
