Remove Preferences::loadOldSearchNs() (deprecated since 1.19)

Change-Id: Ia9bfafddd9a861b1ca78fc1a642981dc9535ab27

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index ec7200a..a099eff 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -217,6 +217,7 @@ changes to languages because of Bugzilla reports.
 * (bug 65781) Removed block warning on included {{Special:Contributions}}
 * Removed Skin::makeGlobalVariablesScript. (deprecated since 1.19)
 * Removed MWNamespace::isMain(). (deprecated since 1.19)
+* Removed Preferences::loadOldSearchNs(). (deprecated since 1.19)
 
 ==== Renamed classes ====
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 081315e..f884ec3 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1463,27 +1463,6 @@ class Preferences {
                        return array( $result, 'mailerror' );
                }
        }
-
-       /**
-        * @deprecated since 1.19
-        * @param User $user
-        * @return array
-        */
-       public static function loadOldSearchNs( $user ) {
-               wfDeprecated( __METHOD__, '1.19' );
-
-               $searchableNamespaces = SearchEngine::searchableNamespaces();
-               // Back compat with old format
-               $arr = array();
-
-               foreach ( $searchableNamespaces as $ns => $name ) {
-                       if ( $user->getOption( 'searchNs' . $ns ) ) {
-                               $arr[] = $ns;
-                       }
-               }
-
-               return $arr;
-       }
 }
 
 /** Some tweaks to allow js prefs to work */