[MediaWiki-commits] [Gerrit] Avoid "$text must be a string" in Linker::formatLinksInComment - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Avoid "$text must be a string" in Linker::formatLinksInComment
..


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
---
M includes/Linker.php
1 file changed, 12 insertions(+), 10 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Linker.php b/includes/Linker.php
index 842d276..b5e7e2f 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1464,17 +1464,19 @@
$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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/246860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I28fbf7408dee8f46675bd7514dc0a87b0924e153
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoid "$text must be a string" in Linker::formatLinksInComment - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/246860

Change subject: Avoid "$text must be a string" in Linker::formatLinksInComment
..

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
---
M includes/Linker.php
1 file changed, 12 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/246860/1

diff --git a/includes/Linker.php b/includes/Linker.php
index e821004..82bfeab 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1464,17 +1464,19 @@
$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 ) {
+   $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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/246860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28fbf7408dee8f46675bd7514dc0a87b0924e153
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits