r76250 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76249‎ | r76250 | r76251 >
Date:15:12, 7 November 2010
Author:platonides
Status:ok (Comments)
Tags:
Comment:
Follow up r76207. It's called $skin here.
This paramter is completely unused, though. Any reason to keep it?
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -2302,7 +2302,7 @@
23032303 * @param $useESI boolean
23042304 * @return string html <script> and <style> tags
23052305 */
2306 - protected function makeResourceLoaderLink( $skin, $modules, $only, $useESI = false ) {
 2306+ protected function makeResourceLoaderLink( Skin $skin, $modules, $only, $useESI = false ) {
23072307 global $wgUser, $wgLang, $wgLoadScript, $wgResourceLoaderUseESI,
23082308 $wgResourceLoaderInlinePrivateModules;
23092309 // Lazy-load ResourceLoader
@@ -2332,7 +2332,7 @@
23332333 // Recursively call us for every item
23342334 $links = '';
23352335 foreach ( $modules as $name ) {
2336 - $links .= $this->makeResourceLoaderLink( $sk, $name, $only, $useESI );
 2336+ $links .= $this->makeResourceLoaderLink( $skin, $name, $only, $useESI );
23372337 }
23382338 return $links;
23392339 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r76298Per r76250, actually use the $skin parameter in makeResourceLoaderLink()catrope11:07, 8 November 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76207Remove checks for debug mode and module count on every makeResourceLoaderLink...platonides18:52, 6 November 2010

Comments

#Comment by Catrope (talk | contribs)   19:55, 7 November 2010

It shouldn't be unused, the skin should be part of the URL. I'll look into this tomorrow as part of my code review spree.

Status & tagging log