From: Nik Everett <neverett@wikimedia.org>
Date: Thu, 4 Sep 2014 18:59:19 +0000 (-0400)
Subject: Be more careful with Special: prefix searching
X-Git-Tag: 1.31.0-rc.0~14163
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=1f0d72968d51e951b6bef09109cb254c58faf667;p=lhc%2Fweb%2Fwiklou.git

Be more careful with Special: prefix searching

Bug: 70409
Change-Id: I3764bff1bf7b2d11a7c8f8cc8564eeae9953ea30
---

diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 35be2a9d87..295183c62a 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -174,6 +174,9 @@ abstract class PrefixSearch {
 		if ( $subpageSearch !== null ) {
 			// Try matching the full search string as a page name
 			$specialTitle = Title::makeTitleSafe( NS_SPECIAL, $searchKey );
+			if ( !$specialTitle ) {
+				return array();
+			}
 			$special = SpecialPageFactory::getPage( $specialTitle->getText() );
 			if ( $special ) {
 				$subpages = $special->prefixSearchSubpages( $subpageSearch, $limit );