if( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) {
array_push( $this->mOutput->mLanguageLinks, $nt->getFullText() );
$tmp = $prefix . $trail ;
- $s .= (trim($tmp) == '')? '': $tmp;
+ $s .= (trim($tmp) == '') ? '': $tmp;
continue;
}
if ( $ns == NS_CATEGORY ) {
wfProfileIn( "$fname-category" );
$t = $nt->getText();
+ $s = rtrim($s . "\n"); # bug 87
$wgLinkCache->suspend(); # Don't save in links/brokenlinks
$pPLC=$sk->postParseLinkColour();
* Strip the whitespace Category links produce, see bug 87
* @todo We might want to use trim($tmp, "\n") here.
*/
- $tmp = $prefix . $trail;
- $s .= trim($tmp) == '' ? '': $tmp;
+ $s .= trim($prefix . $trail, "\n") == '' ? '': $prefix . $trail;
wfProfileOut( "$fname-category" );
continue;
case MAG_CURRENTDAYNAME:
return $varCache[$index] = $wgContLang->getWeekdayName( date('w')+1 );
case MAG_CURRENTYEAR:
- return $varCache[$index] = $wgContLang->formatNum( date( 'Y' ) );
+ return $varCache[$index] = $wgContLang->formatNum( date( 'Y' ), true );
case MAG_CURRENTTIME:
return $varCache[$index] = $wgContLang->time( wfTimestampNow(), false );
case MAG_CURRENTWEEK: