| Index: branches/REL1_15/extensions/HideNamespace/HideNamespace.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | 'name' => 'HideNamespace', |
| 28 | 28 | 'description' => 'Hides namespace in the header and title when a page is in specified namespace or when the <code><nowiki>{{#hidens:}}</nowiki></code> parser function is called.', |
| 29 | 29 | 'descriptionmsg' => 'hidens-desc', |
| 30 | | - 'version' => '1.4.1', |
| | 30 | + 'version' => '1.4.1a', |
| 31 | 31 | 'author' => 'Matěj Grabovský', |
| 32 | 32 | 'url' => 'http://www.mediawiki.org/wiki/Extension:HideNamespace', |
| 33 | 33 | ); |
| — | — | @@ -45,10 +45,9 @@ |
| 46 | 46 | function wfHideNamespaceSetupLanguageGetMagic( &$mw, $lang ) { |
| 47 | 47 | require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'HideNamespace.i18n.magic.php' ); |
| 48 | 48 | |
| 49 | | - if( $lang == 'en' || !isset( $magicWords[$lang] ) ) |
| 50 | | - $mw += $magicWords['en']; |
| 51 | | - else |
| 52 | | - $mw += array_merge( $magicWords['en'], $magicWords[$lang] ); |
| | 49 | + $mw = array_merge( $mw, $magicWords['en'] ); |
| | 50 | + if( $lang !== 'en' && isset( $magicWords[$lang] ) ) |
| | 51 | + $mw = array_merge( $mw, $magicWords[$lang] ); |
| 53 | 52 | |
| 54 | 53 | return true; |
| 55 | 54 | } |