From 9ce5ca988629590836070ad947a5cc776b3ead3b Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 16 Oct 2015 19:27:53 +0200 Subject: [PATCH] Avoid "$text must be a string" in Linker::formatLinksInComment Just check the passed variable on caller side to avoid the warning. Bug: T109977 Change-Id: I28fbf7408dee8f46675bd7514dc0a87b0924e153 --- includes/Linker.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index 842d276d2a..b5e7e2f308 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1464,17 +1464,19 @@ class Linker { $linkText = $text; $linkTarget = Linker::normalizeSubpageLink( $title, $match[1], $linkText ); - $target = Title::newFromText( $linkTarget ); - if ( $target ) { - if ( $target->getText() == '' && !$target->isExternal() - && !$local && $title - ) { - $newTarget = clone $title; - $newTarget->setFragment( '#' . $target->getFragment() ); - $target = $newTarget; - } + if ( $linkTarget !== null ) { + $target = Title::newFromText( $linkTarget ); + if ( $target ) { + if ( $target->getText() == '' && !$target->isExternal() + && !$local && $title + ) { + $newTarget = clone $title; + $newTarget->setFragment( '#' . $target->getFragment() ); + $target = $newTarget; + } - $thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail; + $thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail; + } } } if ( $thelink ) { -- 2.20.1