dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add attributes parameter to ShowSearchHitTitle"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderClientHtml.php
diff --git
a/includes/resourceloader/ResourceLoaderClientHtml.php
b/includes/resourceloader/ResourceLoaderClientHtml.php
index
06f9841
..
c76ed91
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/
includes/resourceloader/ResourceLoaderClientHtml.php
@@
-149,6
+149,13
@@
class ResourceLoaderClientHtml {
continue;
}
continue;
}
+ $context = $this->getContext( $module->getGroup(), ResourceLoaderModule::TYPE_COMBINED );
+ if ( $module->isKnownEmpty( $context ) ) {
+ // Avoid needless request or embed for empty module
+ $data['states'][$name] = 'ready';
+ continue;
+ }
+
if ( $module->shouldEmbedModule( $this->context ) ) {
// Embed via mw.loader.implement per T36907.
$data['embed']['general'][] = $name;
if ( $module->shouldEmbedModule( $this->context ) ) {
// Embed via mw.loader.implement per T36907.
$data['embed']['general'][] = $name;