From 5518d3ac02c8be4881aa2a61d22f2077be874391 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 24 Jul 2014 16:02:45 -0700 Subject: [PATCH] Check whether TYPE_COMBINED modules are allowed to be included in the page With the introduction of the OutputPageScriptsForBottomQueue hook, modules loaded through it are TYPE_COMBINED, which OutputPage::makeResourceLoaderLink was not checking on whether or not it was safe to include them. Change-Id: I33f39a5643b3d05db5a89e62fa6c86d437dea143 --- includes/OutputPage.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index fbdde64d6c..64d2bc8b39 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2728,6 +2728,8 @@ $templates && $only == ResourceLoaderModule::TYPE_SCRIPTS ) || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_STYLES ) && $only == ResourceLoaderModule::TYPE_STYLES ) + || ( $module->getOrigin() > $this->getAllowedModules( ResourceLoaderModule::TYPE_COMBINED ) + && $only == ResourceLoaderModule::TYPE_COMBINED ) || ( $this->mTarget && !in_array( $this->mTarget, $module->getTargets() ) ) ) { continue; -- 2.20.1