http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72139
Revision: 72139
Author: tparscal
Date: 2010-09-01 18:23:01 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Made the $only parameter no longer optional for
OutputPage::makeResourceLoaderLink
Modified Paths:
--------------
branches/resourceloader/phase3/includes/OutputPage.php
Modified: branches/resourceloader/phase3/includes/OutputPage.php
===================================================================
--- branches/resourceloader/phase3/includes/OutputPage.php 2010-09-01
18:21:17 UTC (rev 72138)
+++ branches/resourceloader/phase3/includes/OutputPage.php 2010-09-01
18:23:01 UTC (rev 72139)
@@ -2279,8 +2279,8 @@
return $ret;
}
-
- static function makeResourceLoaderLink( $skin, $modules, $only = null )
{
+
+ static function makeResourceLoaderLink( $skin, $modules, $only ) {
global $wgUser, $wgLang, $wgRequest, $wgScriptPath;
// TODO: Should this be a static function of ResourceLoader
instead?
$query = array(
@@ -2288,10 +2288,8 @@
'lang' => $wgLang->getCode(),
'debug' => $wgRequest->getBool( 'debug' ) &&
$wgRequest->getVal( 'debug' ) !== 'false',
'skin' => $wgUser->getSkin()->getSkinName(),
+ 'only' => $only,
);
- if ( isset( $only ) ) {
- $query['only'] = $only;
- }
// Automatically select style/script elements
if ( $only === 'styles' ) {
return Html::linkedStyle( wfAppendQuery( $wgScriptPath
. '/load.php', $query ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
