From 337b1e2ecd0a199d482fab9cdc5bd09723e05910 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 2 Sep 2015 22:55:49 -0700 Subject: [PATCH] PrefixSearch: Avoid passing non-strings to Title::newFromText() We already handle the invalid title gracefully here anyway, so just rely on that behavior and just skip the Title construction bit :) Bug: T109975 Change-Id: I0dc3d91b6b4cfb97664aa6ca39c5c8f086d70db5 --- includes/PrefixSearch.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php index 55a4f49b34..430b4b8972 100644 --- a/includes/PrefixSearch.php +++ b/includes/PrefixSearch.php @@ -362,7 +362,11 @@ abstract class PrefixSearch { $ns = NS_MAIN; // if searching on many always default to main } - $t = Title::newFromText( $search, $ns ); + $t = null; + if ( is_string( $search ) ) { + $t = Title::newFromText( $search, $ns ); + } + $prefix = $t ? $t->getDBkey() : ''; $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'page', -- 2.20.1