* (bug 2885) Remove unnecessary reference parameter which broke classic skin
talk notification on PHP 5.0.5
* Fix Parser::unstrip on PHP 5.1.0RC4
+* (bug 3852) "Redirected from" link no longer obscured on double-redirects
=== Caveats ===
$this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
$wgOut->setRobotpolicy( 'noindex,follow' );
}
+ $wasRedirected = false;
if ( '' != $this->mRedirectedFrom ) {
if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
$sk = $wgUser->getSkin();
$wgOut->setSubtitle( $s );
# Can't cache redirects
$pcache = false;
+ $wasRedirected = true;
}
} elseif ( !empty( $rdfrom ) ) {
global $wgRedirectSources;
$redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
$s = wfMsg( 'redirectedfrom', $redir );
$wgOut->setSubtitle( $s );
+ $wasRedirected = true;
}
}
# Display redirect
$imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
$imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
- $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+ if( !$wasRedirected ) {
+ $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+ }
$targetUrl = $rt->escapeLocalURL();
$titleText = htmlspecialchars( $rt->getPrefixedText() );
$link = $sk->makeLinkObj( $rt );