r39067 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r39066‎ | r39067 | r39068 >
Date:15:18, 10 August 2008
Author:ialex
Status:old
Tags:
Comment:
* Added $wgCategoryPrefixedDefaultSortkey.
* Use OutputPage::addExtensionStyle() if available.
Modified paths:
  • /trunk/extensions/Configure/CHANGELOG (modified) (history)
  • /trunk/extensions/Configure/Configure.page.php (modified) (history)
  • /trunk/extensions/Configure/Configure.php (modified) (history)
  • /trunk/extensions/Configure/Configure.settings-core.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.page.php
@@ -576,13 +576,18 @@
577577 */
578578 protected function injectScriptsAndStyles() {
579579 global $wgOut, $wgScriptPath, $wgUseAjax, $wgJsMimeType, $wgConfigureStyleVersion;
580 - $wgOut->addLink(
581 - array(
582 - 'rel' => 'stylesheet',
583 - 'type' => 'text/css',
584 - 'href' => "{$wgScriptPath}/extensions/Configure/Configure.css?{$wgConfigureStyleVersion}",
585 - )
586 - );
 580+ $href = "{$wgScriptPath}/extensions/Configure/Configure.css?{$wgConfigureStyleVersion}";
 581+ if( is_callable( array( $wgOut, 'addExtensionStyle' ) ) ){
 582+ $wgOut->addExtensionStyle( $href );
 583+ } else {
 584+ $wgOut->addLink(
 585+ array(
 586+ 'rel' => 'stylesheet',
 587+ 'type' => 'text/css',
 588+ 'href' => $href,
 589+ )
 590+ );
 591+ }
587592 if( is_callable( array( 'Xml', 'encodeJsVar' ) ) ){ # 1.9 +
588593 $add = Xml::encodeJsVar( wfMsg( 'configure-js-add' ) );
589594 $remove = Xml::encodeJsVar( wfMsg( 'configure-js-remove' ) );
Index: trunk/extensions/Configure/CHANGELOG
@@ -1,6 +1,9 @@
22 This file lists changes on this extension.
33 Localisation updates are done on betawiki and aren't listed here.
44
 5+0.6.8 - 10 August 2008
 6+ Added $wgCategoryPrefixedDefaultSortkey.
 7+
58 0.6.7 - 8 August 2008
69 Added $wgDisableTitleConversion, $wgPasswordAttemptThrottle and
710 $wgOverrideSiteFeed.
Index: trunk/extensions/Configure/Configure.settings-core.php
@@ -261,6 +261,7 @@
262262 'category' => array(
263263 'wgCategoryMagicGallery' => 'bool',
264264 'wgCategoryPagingLimit' => 'int',
 265+ 'wgCategoryPrefixedDefaultSortkey' => 'bool',
265266 'wgUseCategoryBrowser' => 'bool',
266267 ),
267268 ),
@@ -1142,6 +1143,7 @@
11431144 'wgDisableTitleConversion' => array( array( '1.14alpha', '>=' ) ),
11441145 'wgOverrideSiteFeed' => array( array( '1.14alpha', '>=' ) ),
11451146 'wgPasswordAttemptThrottle' => array( array( '1.14alpha', '>=' ) ),
 1147+ 'wgCategoryPrefixedDefaultSortkey' => array( array( '1.14alpha', '>=' ) ),
11461148 ## Obsolete
11471149 'wgProfileSampleRate' => array( array( '1.8alpha', '<' ) ),
11481150 'wgProfilerType' => array( array( '1.8alpha', '<' ) ),
Index: trunk/extensions/Configure/Configure.php
@@ -17,7 +17,7 @@
1818 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
1919 'description' => 'Allow authorised users to configure the wiki by a web-based interface',
2020 'descriptionmsg' => 'configure-desc',
21 - 'version' => '0.6.7',
 21+ 'version' => '0.6.8',
2222 );
2323
2424 ## Configuration part

Status & tagging log