| Index: trunk/extensions/Narayam/Narayam.hooks.php |
| — | — | @@ -53,19 +53,10 @@ |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * Get the available schemes for the user and content language |
| 57 | | - * and mandatory schemes for the languages specifed, if any. |
| 58 | 57 | * @return array( scheme name => module name ) |
| 59 | 58 | */ |
| 60 | 59 | protected static function getSchemes() { |
| 61 | 60 | global $wgLanguageCode, $wgLang, $wgNarayamSchemes; |
| 62 | | - global $wgNarayamAlwaysLoadForLanguages; |
| 63 | | - |
| 64 | | - $mandatorySchemes = array (); |
| 65 | | - foreach ($wgNarayamAlwaysLoadForLanguages as $languageCode) { |
| 66 | | - if ( isset( $wgNarayamSchemes[$languageCode] ) ) { |
| 67 | | - $mandatorySchemes += $wgNarayamSchemes[$languageCode]; |
| 68 | | - } |
| 69 | | - } |
| 70 | 61 | |
| 71 | 62 | $userlangCode = $wgLang->getCode(); |
| 72 | 63 | $contlangSchemes = isset( $wgNarayamSchemes[$wgLanguageCode] ) ? |
| — | — | @@ -73,7 +64,7 @@ |
| 74 | 65 | $userlangSchemes = isset( $wgNarayamSchemes[$userlangCode] ) ? |
| 75 | 66 | $wgNarayamSchemes[$userlangCode] : array(); |
| 76 | 67 | |
| 77 | | - return $mandatorySchemes + $userlangSchemes + $contlangSchemes; |
| | 68 | + return $userlangSchemes + $contlangSchemes; |
| 78 | 69 | } |
| 79 | 70 | |
| 80 | 71 | public static function addPreference( $user, &$preferences ) { |
| Index: trunk/extensions/Narayam/Narayam.php |
| — | — | @@ -41,9 +41,6 @@ |
| 42 | 42 | 'key' => 'm' |
| 43 | 43 | ); |
| 44 | 44 | |
| 45 | | -// Schemes for the languages specified in this arrays will be loaded always |
| 46 | | -$wgNarayamAlwaysLoadForLanguages = array(); |
| 47 | | - |
| 48 | 45 | // Array mapping language codes and scheme names to module names |
| 49 | 46 | // Custom schemes can be added here |
| 50 | 47 | $wgNarayamSchemes = array( |