Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php |
— | — | @@ -10,7 +10,6 @@ |
11 | 11 | |
12 | 12 | require_once( 'SMW_GlobalFunctions.php' ); |
13 | 13 | |
14 | | - |
15 | 14 | /** |
16 | 15 | * Function to switch on Semantic MediaWiki. This function must be called in |
17 | 16 | * LocalSettings.php after including SMW_Settings.php. It is used to ensure |
— | — | @@ -59,7 +58,6 @@ |
60 | 59 | $wgHooks['SpecialVersionExtensionTypes'][] = 'smwfOldAddSemanticExtensionType'; |
61 | 60 | } |
62 | 61 | |
63 | | - |
64 | 62 | // Register special pages aliases file |
65 | 63 | $wgExtensionAliasesFiles['SemanticMediaWiki'] = $smwgIP . 'languages/SMW_Aliases.php'; |
66 | 64 | |
— | — | @@ -280,7 +278,7 @@ |
281 | 279 | * @return true |
282 | 280 | */ |
283 | 281 | function smwfOldAddSemanticExtensionType( SpecialVersion &$oSpecialVersion, array &$aExtensionTypes ) { |
284 | | - smwfAddSemanticExtensionType( $aExtensionTypes ); |
| 282 | + return smwfAddSemanticExtensionType( $aExtensionTypes ); |
285 | 283 | } |
286 | 284 | |
287 | 285 | /** |
— | — | @@ -457,11 +455,13 @@ |
458 | 456 | */ |
459 | 457 | function smwfInitContentLanguage( $langcode ) { |
460 | 458 | global $smwgIP, $smwgContLang; |
| 459 | + |
461 | 460 | if ( !empty( $smwgContLang ) ) { return; } |
462 | 461 | wfProfileIn( 'smwfInitContentLanguage (SMW)' ); |
463 | 462 | |
464 | 463 | $smwContLangFile = 'SMW_Language' . str_replace( '-', '_', ucfirst( $langcode ) ); |
465 | 464 | $smwContLangClass = 'SMWLanguage' . str_replace( '-', '_', ucfirst( $langcode ) ); |
| 465 | + |
466 | 466 | if ( file_exists( $smwgIP . 'languages/' . $smwContLangFile . '.php' ) ) { |
467 | 467 | include_once( $smwgIP . 'languages/' . $smwContLangFile . '.php' ); |
468 | 468 | } |
— | — | @@ -474,4 +474,4 @@ |
475 | 475 | $smwgContLang = new $smwContLangClass(); |
476 | 476 | |
477 | 477 | wfProfileOut( 'smwfInitContentLanguage (SMW)' ); |
478 | | -} |
| 478 | +} |
\ No newline at end of file |