dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b76c35d
)
Merge "Check whether TYPE_COMBINED modules are allowed to be included in the page"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Jul 2014 13:45:20 +0000
(13:45 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 30 Jul 2014 13:45:20 +0000
(13:45 +0000)
includes/OutputPage.php
patch
|
blob
|
history
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;