r87712 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87711‎ | r87712 | r87713 >
Date:13:20, 9 May 2011
Author:catrope
Status:ok (Comments)
Tags:
Comment:
1.17wmf1: Merge r87711 by hand. Because of recent changes in trunk, not a single line of r87711 would apply cleanly.
Modified paths:
  • /branches/wmf/1.17wmf1/includes/OutputPage.php (modified) (history)
  • /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderContext.php (modified) (history)
  • /branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/OutputPage.php
@@ -2403,7 +2403,7 @@
24042404 continue;
24052405 }
24062406
2407 - $query['modules'] = implode( '|', array_keys( $modules ) );
 2407+ $query['modules'] = str_replace( '.', '!', implode( '|', array_keys( $modules ) ) );
24082408
24092409 // Support inlining of private modules if configured as such
24102410 if ( $group === 'private' && $wgResourceLoaderInlinePrivateModules ) {
Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderContext.php
@@ -51,7 +51,7 @@
5252 // Interpret request
5353 // List of modules
5454 $modules = $request->getVal( 'modules' );
55 - $this->modules = $modules ? explode( '|', $modules ) : array();
 55+ $this->modules = $modules ? explode( '|', str_replace( '!', '.', $modules ) ) : array();
5656 // Various parameters
5757 $this->skin = $request->getVal( 'skin' );
5858 $this->user = $request->getVal( 'user' );
Index: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js
@@ -823,7 +823,7 @@
824824 }
825825 }
826826 requests[requests.length] = $.extend(
827 - { 'modules': groups[group].join( '|' ), 'version': formatVersionNumber( version ) }, base
 827+ { 'modules': groups[group].join( '|' ).replace( /\./g, '!' ), 'version': formatVersionNumber( version ) }, base
828828 );
829829 }
830830 // Clear the batch - this MUST happen before we append the

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r87711(bug 28840) Commit patch by bawolff that encodes dots in ResourceLoader modul...catrope13:10, 9 May 2011

Comments

#Comment by Bawolff (talk | contribs)   05:40, 19 May 2011

I'm tagging this 1.17 - Well its supposed to be temporary, it should definitely be included in the next 1.17 beta if a better solution is not found by then.

Status & tagging log