| Index: trunk/phase3/includes/SpecialPreferences.php |
| — | — | @@ -382,8 +382,13 @@ |
| 383 | 383 | } else { |
| 384 | 384 | $checked = ""; |
| 385 | 385 | } |
| | 386 | + if ( isset( $skinNames[$skinkey] ) ) { |
| | 387 | + $sn = $skinNames[$skinkey]; |
| | 388 | + } else { |
| | 389 | + $sn = $skinname; |
| | 390 | + } |
| 386 | 391 | $wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\" |
| 387 | | - value=\"$skinkey\"$checked /> {$skinNames[$skinkey]}</label></div>\n" ); |
| | 392 | + value=\"$skinkey\"$checked /> {$sn}</label></div>\n" ); |
| 388 | 393 | } |
| 389 | 394 | $wgOut->addHTML( "</fieldset>\n\n" ); |
| 390 | 395 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -511,6 +511,7 @@ |
| 512 | 512 | $wgAllowRealName = true; |
| 513 | 513 | |
| 514 | 514 | # Extensions |
| | 515 | +$wgSkinExtensionFunctions = array(); |
| 515 | 516 | $wgExtensionFunctions = array(); |
| 516 | 517 | |
| 517 | 518 | # Allow user Javascript page? |
| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -236,6 +236,14 @@ |
| 237 | 237 | wfProfileOut( $fname.'-BlockCache' ); |
| 238 | 238 | wfProfileIn( $fname.'-User' ); |
| 239 | 239 | |
| | 240 | +# Extension setup functions |
| | 241 | +# Entries should be added to this variable during the inclusion |
| | 242 | +# of the extension file. This allows the extension to perform |
| | 243 | +# any necessary initialisation in the fully initialised environment |
| | 244 | +foreach ( $wgSkinExtensionFunctions as $func ) { |
| | 245 | + $func(); |
| | 246 | +} |
| | 247 | + |
| 240 | 248 | if( $wgCommandLineMode ) { |
| 241 | 249 | # Used for some maintenance scripts; user session cookies can screw things up |
| 242 | 250 | # when the database is in an in-between state. |
