| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -861,7 +861,7 @@ |
| 862 | 862 | } |
| 863 | 863 | |
| 864 | 864 | elseif ( $rt = Title::newFromRedirect( $text ) ) { |
| 865 | | - # Don't overwrite the subtitle if this was an old revision |
| | 865 | + # Don't append the subtitle if this was an old revision |
| 866 | 866 | $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ); |
| 867 | 867 | $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser)); |
| 868 | 868 | $wgOut->addParserOutputNoText( $parseout ); |
| — | — | @@ -925,15 +925,15 @@ |
| 926 | 926 | wfProfileOut( __METHOD__ ); |
| 927 | 927 | } |
| 928 | 928 | |
| 929 | | - protected function viewRedirect( $target, $overwriteSubtitle = true, $forceKnown = false ) { |
| | 929 | + protected function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) { |
| 930 | 930 | global $wgParser, $wgOut, $wgContLang, $wgStylePath, $wgUser; |
| 931 | 931 | |
| 932 | 932 | # Display redirect |
| 933 | 933 | $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr'; |
| 934 | 934 | $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png'; |
| 935 | 935 | |
| 936 | | - if( $overwriteSubtitle ) { |
| 937 | | - $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) ); |
| | 936 | + if( $appendSubtitle ) { |
| | 937 | + $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) ); |
| 938 | 938 | } |
| 939 | 939 | $sk = $wgUser->getSkin(); |
| 940 | 940 | if ( $forceKnown ) |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | // probably the redirect page itself. Fake the redirect symbol |
| 69 | 69 | $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); |
| 70 | 70 | $this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ), |
| 71 | | - /* $overwriteSubtitle */ true, /* $forceKnown */ true ); |
| | 71 | + /* $appendSubtitle */ true, /* $forceKnown */ true ); |
| 72 | 72 | $this->viewUpdates(); |
| 73 | 73 | return; |
| 74 | 74 | } |