}
elseif ( $rt = Title::newFromRedirect( $text ) ) {
- # Don't overwrite the subtitle if this was an old revision
+ # Don't append the subtitle if this was an old revision
$this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() );
$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
$wgOut->addParserOutputNoText( $parseout );
wfProfileOut( __METHOD__ );
}
- protected function viewRedirect( $target, $overwriteSubtitle = true, $forceKnown = false ) {
+ protected function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
global $wgParser, $wgOut, $wgContLang, $wgStylePath, $wgUser;
# Display redirect
$imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
$imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
- if( $overwriteSubtitle ) {
- $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+ if( $appendSubtitle ) {
+ $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
}
$sk = $wgUser->getSkin();
if ( $forceKnown )
// probably the redirect page itself. Fake the redirect symbol
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
$this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ),
- /* $overwriteSubtitle */ true, /* $forceKnown */ true );
+ /* $appendSubtitle */ true, /* $forceKnown */ true );
$this->viewUpdates();
return;
}