Merge "Check whether TYPE_COMBINED modules are allowed to be included in the page"

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b832a4c..566ee87 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2726,6 +2726,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;