| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut; |
| 148 | 148 | global $wgScript, $wgStylePath, $wgLanguageCode, $wgContLanguageCode, $wgUseNewInterlanguage; |
| 149 | 149 | global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest; |
| 150 | | - global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses; |
| | 150 | + global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks; |
| 151 | 151 | global $wgMaxCredits, $wgShowCreditsIfMax; |
| 152 | 152 | global $wgPageShowWatchingUsers; |
| 153 | 153 | |
| — | — | @@ -310,7 +310,6 @@ |
| 311 | 311 | $tpl->set('numberofwatchingusers', false); |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | | - $tpl->set('lastmod', $this->lastModified()); |
| 315 | 314 | $tpl->set('copyright',$this->getCopyright()); |
| 316 | 315 | |
| 317 | 316 | $this->credits = false; |
| — | — | @@ -318,6 +317,8 @@ |
| 319 | 318 | if (isset($wgMaxCredits) && $wgMaxCredits != 0) { |
| 320 | 319 | require_once("Credits.php"); |
| 321 | 320 | $this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax); |
| | 321 | + } else { |
| | 322 | + $tpl->set('lastmod', $this->lastModified()); |
| 322 | 323 | } |
| 323 | 324 | |
| 324 | 325 | $tpl->setRef( 'credits', $this->credits ); |
| — | — | @@ -353,11 +354,14 @@ |
| 354 | 355 | |
| 355 | 356 | # Language links |
| 356 | 357 | $language_urls = array(); |
| 357 | | - foreach( $wgOut->getLanguageLinks() as $l ) { |
| 358 | | - $nt = Title::newFromText( $l ); |
| 359 | | - $language_urls[] = array('href' => $nt->getFullURL(), |
| 360 | | - 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l), |
| 361 | | - 'class' => $wgContLang->isRTL() ? 'rtl' : 'ltr'); |
| | 358 | + |
| | 359 | + if ( !$wgHideInterlanguageLinks ) { |
| | 360 | + foreach( $wgOut->getLanguageLinks() as $l ) { |
| | 361 | + $nt = Title::newFromText( $l ); |
| | 362 | + $language_urls[] = array('href' => $nt->getFullURL(), |
| | 363 | + 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l), |
| | 364 | + 'class' => $wgContLang->isRTL() ? 'rtl' : 'ltr'); |
| | 365 | + } |
| 362 | 366 | } |
| 363 | 367 | if(count($language_urls)) { |
| 364 | 368 | $tpl->setRef( 'language_urls', $language_urls); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -465,6 +465,10 @@ |
| 466 | 466 | /** Treat language links as magic connectors, not inline links */ |
| 467 | 467 | $wgInterwikiMagic = true; |
| 468 | 468 | |
| | 469 | +/** Hide interlanguage links from the sidebar */ |
| | 470 | +$wgHideInterlanguageLinks = false; |
| | 471 | + |
| | 472 | + |
| 469 | 473 | /** We speak UTF-8 all the time now, unless some oddities happen */ |
| 470 | 474 | $wgInputEncoding = 'UTF-8'; |
| 471 | 475 | $wgOutputEncoding = 'UTF-8'; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1119,8 +1119,12 @@ |
| 1120 | 1120 | } |
| 1121 | 1121 | |
| 1122 | 1122 | function otherLanguages() { |
| 1123 | | - global $wgOut, $wgContLang, $wgTitle; |
| | 1123 | + global $wgOut, $wgContLang, $wgTitle, $wgHideInterlanguageLinks; |
| 1124 | 1124 | |
| | 1125 | + if ( $wgHideInterlanguageLinks ) { |
| | 1126 | + return ''; |
| | 1127 | + } |
| | 1128 | + |
| 1125 | 1129 | $a = $wgOut->getLanguageLinks(); |
| 1126 | 1130 | if ( 0 == count( $a ) ) { |
| 1127 | 1131 | return ''; |
