* (bug 20885) Search box no longer suggests unavailable special pages

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 992794d..9811163 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -535,6 +535,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Password fields built with HTMLForm now still have the type="password" attribute
   if $wgHtml5=false.
 * (bug 20836) Preload now works for MediaWiki namespace
+* (bug 20885) Search box no longer suggests unavailable special pages
 
 == API changes in 1.16 ==
 

diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 10c8593..eb1a9cf 100644 (file)
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -83,6 +83,9 @@ class PrefixSearch {
                        $keys[$wgContLang->caseFold( $page )] = $page;
                }
                foreach( $wgContLang->getSpecialPageAliases() as $page => $aliases ) {
+                       if( !array_key_exists( $page, SpecialPage::$mList ) ) # bug 20885
+                               continue;
+
                        foreach( $aliases as $alias ) {
                                $keys[$wgContLang->caseFold( $alias )] = $alias;
                        }