dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
253613a
)
Explanatory comment for r111023
author
Roan Kattouw
<catrope@users.mediawiki.org>
Thu, 9 Feb 2012 10:42:53 +0000
(10:42 +0000)
committer
Roan Kattouw
<catrope@users.mediawiki.org>
Thu, 9 Feb 2012 10:42:53 +0000
(10:42 +0000)
includes/OutputPage.php
patch
|
blob
|
history
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
c6d3680
..
781aa61
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-2681,6
+2681,8
@@
$templates
);
// Load embeddable private modules before any loader links
+ // Per bug 34289, this needs to be TYPE_SCRIPTS. Using TYPE_COMBINED
+ // causes the user.options CSS to be loaded twice.
$embedScripts = array( 'user.options', 'user.tokens' );
$scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS );