Various fixes for phan-taint-check

Bug: T216348
Change-Id: Id9e7a4704d62457cac9bd1ca6044dec76472e371

1 files changed, 26 insertions, 15 deletions

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index ec6c5b94c99b..e6d06329ad74 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -167,21 +167,7 @@ class SpecialSearch extends SpecialPage {
 				$url = str_replace( '$1', urlencode( $term ), $searchForwardUrl );
 				$out->redirect( $url );
 			} else {
-				$out->addHTML(
-					"<fieldset>" .
-						"<legend>" .
-							$this->msg( 'search-external' )->escaped() .
-						"</legend>" .
-						"<p class='mw-searchdisabled'>" .
-							$this->msg( 'searchdisabled' )->escaped() .
-						"</p>" .
-						$this->msg( 'googlesearch' )->rawParams(
-							htmlspecialchars( $term ),
-							'UTF-8',
-							$this->msg( 'searchbutton' )->escaped()
-						)->text() .
-					"</fieldset>"
-				);
+				$this->showGoogleSearch( $term );
 			}
 
 			return;
@@ -191,6 +177,31 @@ class SpecialSearch extends SpecialPage {
 	}
 
 	/**
+	 * Output a google search form if search is disabled
+	 *
+	 * @param string $term Search term
+	 * @todo FIXME Maybe we should get rid of this raw html message at some future time
+	 * @suppress SecurityCheck-XSS
+	 */
+	private function showGoogleSearch( $term ) {
+		$this->getOutput()->addHTML(
+			"<fieldset>" .
+				"<legend>" .
+					$this->msg( 'search-external' )->escaped() .
+				"</legend>" .
+				"<p class='mw-searchdisabled'>" .
+					$this->msg( 'searchdisabled' )->escaped() .
+				"</p>" .
+				$this->msg( 'googlesearch' )->rawParams(
+					htmlspecialchars( $term ),
+					'UTF-8',
+					$this->msg( 'searchbutton' )->escaped()
+				)->text() .
+			"</fieldset>"
+		);
+	}
+
+	/**
 	 * Set up basic search parameters from the request and user settings.
 	 *
 	 * @see tests/phpunit/includes/specials/SpecialSearchTest.php