From: Roan Kattouw Date: Thu, 9 Feb 2012 10:36:12 +0000 (+0000) Subject: (bug 34289) user.options CSS loaded twice. Caused by r107534. Made embedded private... X-Git-Tag: 1.31.0-rc.0~24839 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=253613a3358b62055cbb3fb9f7d8baac1ae0ce78;p=lhc%2Fweb%2Fwiklou.git (bug 34289) user.options CSS loaded twice. Caused by r107534. Made embedded private modules scripts-only, because the styles for user.options are included separately in buildCssLinks(), because they need to be applied without JavaScript and because they need to respect $wgAllowUserCssPrefs. No RELEASE-NOTES because I want to merge this into 1.19 as a regression fix --- diff --git a/includes/OutputPage.php b/includes/OutputPage.php index cc9118af52..c6d3680377 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2682,7 +2682,7 @@ $templates // Load embeddable private modules before any loader links $embedScripts = array( 'user.options', 'user.tokens' ); - $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED ); + $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS ); // Script and Messages "only" requests marked for top inclusion // Messages should go first