Avoid "$text must be a string" in Linker::formatLinksInComment
authorumherirrender <umherirrender_de.wp@web.de>
Fri, 16 Oct 2015 17:27:53 +0000 (19:27 +0200)
committerumherirrender <umherirrender_de.wp@web.de>
Tue, 27 Oct 2015 16:55:53 +0000 (17:55 +0100)
Just check the passed variable on caller side to avoid the warning.

Bug: T109977
Change-Id: I28fbf7408dee8f46675bd7514dc0a87b0924e153

includes/Linker.php

index 842d276..b5e7e2f 100644 (file)
@@ -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 ) {