r111027 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r111026‎ | r111027 | r111028 >
Date:10:59, 9 February 2012
Author:catrope
Status:ok
Tags:
Comment:
Revert r111023 and r111024, they broke user.options . I'll fix this properly by splitting user.options's CSS part into a separate module; I've apparently known this was needed since r93363
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
——@@ -2681,10 +2681,8 @@
26822682 );
26832683
26842684 // Load embeddable private modules before any loader links
2685 - // Per bug 34289, this needs to be TYPE_SCRIPTS. Using TYPE_COMBINED
2686 - // causes the user.options CSS to be loaded twice.
26872685 $embedScripts = array( 'user.options', 'user.tokens' );
2688 - $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS );
 2686+ $scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED );
26892687
26902688 // Script and Messages "only" requests marked for top inclusion
26912689 // Messages should go first

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r93363Make mw.user.options and mw.user.tokens work in debug mode in IE. Now that mw...catrope05:48, 28 July 2011
r111023(bug 34289) user.options CSS loaded twice. Caused by r107534. Made embedded p...catrope10:36, 9 February 2012
r111024Explanatory comment for r111023catrope10:42, 9 February 2012

Status & tagging log