PrefixSearch: Avoid passing non-strings to Title::newFromText()
authorChad Horohoe <chadh@wikimedia.org>
Thu, 3 Sep 2015 05:55:49 +0000 (22:55 -0700)
committerChad Horohoe <chadh@wikimedia.org>
Thu, 3 Sep 2015 05:57:09 +0000 (22:57 -0700)
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

index 55a4f49..430b4b8 100644 (file)
@@ -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',