From b7f078c75e75c57aa06c4f61f0427bd5ffcf219a Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 17 Nov 2015 01:53:30 +0000
Subject: [PATCH] Remove redundant null-handling for Title::newFromText

* Linker: Follows-up 9ce5ca9886. null is already handled.

* PrefixSearch: Follows-up 337b1e2e. null is already handled.
  If other types are bassed, we want to find these.

* UploadBase: Follows-up 11f5ebec28. null is already handled.
  WebRequest::getVal($name) can only return string or null.

Change-Id: I3dc3b700cde735f5cd9d497f0867a2b4e3b61f46
---
 includes/Linker.php                   | 22 ++++++++++------------
 includes/PrefixSearch.php             |  5 +----
 includes/specials/SpecialMovepage.php |  6 ++----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index b5e7e2f308..842d276d2a 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1464,19 +1464,17 @@ class Linker {
 					$linkText = $text;
 					$linkTarget = Linker::normalizeSubpageLink( $title, $match[1], $linkText );
 
-					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;
+					$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;
 					}
 				}
 				if ( $thelink ) {
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index f36635be9d..e328e9f95a 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -368,10 +368,7 @@ abstract class PrefixSearch {
 			$ns = NS_MAIN; // if searching on many always default to main
 		}
 
-		$t = null;
-		if ( is_string( $search ) ) {
-			$t = Title::newFromText( $search, $ns );
-		}
+		$t = Title::newFromText( $search, $ns );
 
 		$prefix = $t ? $t->getDBkey() : '';
 		$dbr = wfGetDB( DB_SLAVE );
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 589c39f094..e88aa1a16f 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -77,11 +77,9 @@ class MovePageForm extends UnlistedSpecialPage {
 		// Yes, the use of getVal() and getText() is wanted, see bug 20365
 
 		$oldTitleText = $request->getVal( 'wpOldTitle', $target );
-		if ( is_string( $oldTitleText ) ) {
-			$this->oldTitle = Title::newFromText( $oldTitleText );
-		}
+		$this->oldTitle = Title::newFromText( $oldTitleText );
 
-		if ( $this->oldTitle === null ) {
+		if ( !$this->oldTitle ) {
 			// Either oldTitle wasn't passed, or newFromText returned null
 			throw new ErrorPageError( 'notargettitle', 'notargettext' );
 		}
-- 
2.20.1