From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 16 Oct 2015 17:27:53 +0000 (+0200)
Subject: Avoid "$text must be a string" in Linker::formatLinksInComment
X-Git-Tag: 1.31.0-rc.0~9122^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=9ce5ca9886;p=lhc%2Fweb%2Fwiklou.git

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
---

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 ) {