From df4c5f19ae79feabe48c0c784fe5d4ef90cfa350 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Fri, 17 Aug 2018 19:11:54 +0200 Subject: [PATCH] Simplify redirect linking in InfoAction - Only call WikiPage::getRedirectTarget once - Use the result of getRedirectTarget to determine if the page info must be shown, because sometimes Title::isRedirect gets wrong state, see T172016 for more information Bug: T172016 Change-Id: Ic789207ba00d057a35e82a4c22628207eeb7b5fd --- includes/actions/InfoAction.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index dc661aa63c..11b8badabf 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -233,13 +233,14 @@ class InfoAction extends FormlessAction { ]; // Is it a redirect? If so, where to? - if ( $title->isRedirect() ) { + $redirectTarget = $this->page->getRedirectTarget(); + if ( $redirectTarget !== null ) { $pageInfo['header-basic'][] = [ $this->msg( 'pageinfo-redirectsto' ), - $linkRenderer->makeLink( $this->page->getRedirectTarget() ) . + $linkRenderer->makeLink( $redirectTarget ) . $this->msg( 'word-separator' )->escaped() . $this->msg( 'parentheses' )->rawParams( $linkRenderer->makeLink( - $this->page->getRedirectTarget(), + $redirectTarget, $this->msg( 'pageinfo-redirectsto-info' )->text(), [], [ 'action' => 'info' ] -- 2.20.1