From 763e137d2cebcd506525251b7b4e4f76a4eaf1b9 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sat, 13 Sep 2014 16:35:56 -0700 Subject: [PATCH] ResourceLoaderWikiModule: Check content format instead of content model For Gadgets 2.0, we have custom content models that represent JavaScript and CSS pages. Comparing the exact content model here is too strict, when we really want to know if the page supports the JavaScript or CSS formats. Also fix a debug log comment that didn't work due to improper quoting. Change-Id: I64e86c74173b1c88cac71483327cacdd8b9967b9 --- includes/resourceloader/ResourceLoaderWikiModule.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php index d45316fd2d..2eaca67961 100644 --- a/includes/resourceloader/ResourceLoaderWikiModule.php +++ b/includes/resourceloader/ResourceLoaderWikiModule.php @@ -96,14 +96,14 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule { return null; } - $model = $content->getModel(); - - if ( $model !== CONTENT_MODEL_CSS && $model !== CONTENT_MODEL_JAVASCRIPT ) { - wfDebugLog( 'resourceloader', __METHOD__ . ': bad content model $model for JS/CSS page!' ); + if ( $content->isSupportedFormat( CONTENT_FORMAT_JAVASCRIPT ) ) { + return $content->serialize( CONTENT_FORMAT_JAVASCRIPT ); + } elseif ( $content->isSupportedFormat( CONTENT_FORMAT_CSS ) ) { + return $content->serialize( CONTENT_FORMAT_CSS ); + } else { + wfDebugLog( 'resourceloader', __METHOD__ . ": bad content model {$content->getModel()} for JS/CSS page!" ); return null; } - - return $content->getNativeData(); //NOTE: this is safe, we know it's JS or CSS } /* Methods */ -- 2.20.1