From: Kunal Mehta <legoktm@gmail.com>
Date: Thu, 24 Jul 2014 23:02:45 +0000 (-0700)
Subject: Check whether TYPE_COMBINED modules are allowed to be included in the page
X-Git-Tag: 1.31.0-rc.0~14673^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=5518d3ac02c8be4881aa2a61d22f2077be874391;p=lhc%2Fweb%2Fwiklou.git

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
---

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;