r111023 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r111022‎ | r111023 | r111024 >
Date:10:36, 9 February 2012
Author:catrope
Status:reverted
Tags:
Comment:
(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
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
——@@ -2682,7 +2682,7 @@
26832683
26842684 // Load embeddable private modules before any loader links
26852685 $embedScripts = array( 'user.options', 'user.tokens' );
2686 - $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED );
 2686+ $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS );
26872687
26882688 // Script and Messages "only" requests marked for top inclusion
26892689 // Messages should go first

Follow-up revisions

RevisionCommit summaryAuthorDate
r111024Explanatory comment for r111023catrope10:42, 9 February 2012
r111027Revert r111023 and r111024, they broke user.options . I'll fix this properly ...catrope10:59, 9 February 2012
r111029(bug 34289) user.options CSS loaded twice. Fixed by splitting off the CSS par...catrope11:04, 9 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r107534Move embedded ResourceLoader modules to the <head>...krinkle22:20, 28 December 2011

Status & tagging log