Index: trunk/extensions/Configure/Configure.page.php |
— | — | @@ -576,13 +576,18 @@ |
577 | 577 | */ |
578 | 578 | protected function injectScriptsAndStyles() { |
579 | 579 | 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 | + } |
587 | 592 | if( is_callable( array( 'Xml', 'encodeJsVar' ) ) ){ # 1.9 + |
588 | 593 | $add = Xml::encodeJsVar( wfMsg( 'configure-js-add' ) ); |
589 | 594 | $remove = Xml::encodeJsVar( wfMsg( 'configure-js-remove' ) ); |
Index: trunk/extensions/Configure/CHANGELOG |
— | — | @@ -1,6 +1,9 @@ |
2 | 2 | This file lists changes on this extension. |
3 | 3 | Localisation updates are done on betawiki and aren't listed here. |
4 | 4 | |
| 5 | +0.6.8 - 10 August 2008 |
| 6 | + Added $wgCategoryPrefixedDefaultSortkey. |
| 7 | + |
5 | 8 | 0.6.7 - 8 August 2008 |
6 | 9 | Added $wgDisableTitleConversion, $wgPasswordAttemptThrottle and |
7 | 10 | $wgOverrideSiteFeed. |
Index: trunk/extensions/Configure/Configure.settings-core.php |
— | — | @@ -261,6 +261,7 @@ |
262 | 262 | 'category' => array( |
263 | 263 | 'wgCategoryMagicGallery' => 'bool', |
264 | 264 | 'wgCategoryPagingLimit' => 'int', |
| 265 | + 'wgCategoryPrefixedDefaultSortkey' => 'bool', |
265 | 266 | 'wgUseCategoryBrowser' => 'bool', |
266 | 267 | ), |
267 | 268 | ), |
— | — | @@ -1142,6 +1143,7 @@ |
1143 | 1144 | 'wgDisableTitleConversion' => array( array( '1.14alpha', '>=' ) ), |
1144 | 1145 | 'wgOverrideSiteFeed' => array( array( '1.14alpha', '>=' ) ), |
1145 | 1146 | 'wgPasswordAttemptThrottle' => array( array( '1.14alpha', '>=' ) ), |
| 1147 | + 'wgCategoryPrefixedDefaultSortkey' => array( array( '1.14alpha', '>=' ) ), |
1146 | 1148 | ## Obsolete |
1147 | 1149 | 'wgProfileSampleRate' => array( array( '1.8alpha', '<' ) ), |
1148 | 1150 | 'wgProfilerType' => array( array( '1.8alpha', '<' ) ), |
Index: trunk/extensions/Configure/Configure.php |
— | — | @@ -17,7 +17,7 @@ |
18 | 18 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure', |
19 | 19 | 'description' => 'Allow authorised users to configure the wiki by a web-based interface', |
20 | 20 | 'descriptionmsg' => 'configure-desc', |
21 | | - 'version' => '0.6.7', |
| 21 | + 'version' => '0.6.8', |
22 | 22 | ); |
23 | 23 | |
24 | 24 | ## Configuration part |