| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -155,17 +155,7 @@ |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /* show links to different language variants */ |
| 159 | | - global $wgDisableLangConversion; |
| 160 | | - $variants = $wgContLang->getVariants(); |
| 161 | | - if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) { |
| 162 | | - $actstr = ''; |
| 163 | | - foreach( $variants as $code ) { |
| 164 | | - $varname = $wgContLang->getVariantname( $code ); |
| 165 | | - if( $varname == 'disable' ) |
| 166 | | - continue; |
| 167 | | - $s .= ' | <a href="' . $wgTitle->getLocalUrl( 'variant=' . $code ) . '">' . $varname . '</a>'; |
| 168 | | - } |
| 169 | | - } |
| | 159 | + $s .= $this->variantLinks(); |
| 170 | 160 | |
| 171 | 161 | return $s; |
| 172 | 162 | } |
| Index: trunk/phase3/skins/Nostalgia.php |
| — | — | @@ -68,6 +68,10 @@ |
| 69 | 69 | } else { |
| 70 | 70 | $s .= $sep . $this->specialLink( "userlogout" ); |
| 71 | 71 | } |
| | 72 | + |
| | 73 | + /* show links to different language variants */ |
| | 74 | + $s .= $this->variantLinks(); |
| | 75 | + |
| 72 | 76 | $s .= $sep . $this->specialPagesList(); |
| 73 | 77 | |
| 74 | 78 | return $s; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -894,7 +894,18 @@ |
| 895 | 895 | } |
| 896 | 896 | # Many people don't like this dropdown box |
| 897 | 897 | #$s .= $sep . $this->specialPagesList(); |
| | 898 | + |
| | 899 | + $s .= $this->variantLinks(); |
| 898 | 900 | |
| | 901 | + return $s; |
| | 902 | + } |
| | 903 | + |
| | 904 | + /** |
| | 905 | + * Language/charset variant links for classic-style skins |
| | 906 | + * @return string |
| | 907 | + */ |
| | 908 | + function variantLinks() { |
| | 909 | + $s = ''; |
| 899 | 910 | /* show links to different language variants */ |
| 900 | 911 | global $wgDisableLangConversion, $wgContLang, $wgTitle; |
| 901 | 912 | $variants = $wgContLang->getVariants(); |
| — | — | @@ -903,10 +914,9 @@ |
| 904 | 915 | $varname = $wgContLang->getVariantname( $code ); |
| 905 | 916 | if( $varname == 'disable' ) |
| 906 | 917 | continue; |
| 907 | | - $s .= ' | <a href="' . $wgTitle->getLocalUrl( 'variant=' . $code ) . '">' . $varname . '</a>'; |
| | 918 | + $s .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'; |
| 908 | 919 | } |
| 909 | 920 | } |
| 910 | | - |
| 911 | 921 | return $s; |
| 912 | 922 | } |
| 913 | 923 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -82,6 +82,7 @@ |
| 83 | 83 | messages as optional for localisation. |
| 84 | 84 | * Fix user_newpass upgrade for prefixed tables (reported by Fyren) |
| 85 | 85 | * (bug 7636) Fix typo in Firefox 2 check (tested by Werdna) |
| | 86 | +* (bug 7663) Include language variant switcher links on Nostalgia skin |
| 86 | 87 | |
| 87 | 88 | |
| 88 | 89 | == Languages updated == |