X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUser.php;h=ab665a49a93d107986a6087a1300b1f2474a3cae;hb=dcd211106c88fcb3b9565045c6b2264dba6be13c;hp=7ba1d91314064b61445c5c5effa3d1a1936df009;hpb=33147cbf016a3b97bd7e3d8cb505319911c2e900;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/User.php b/includes/user/User.php
index 7ba1d91314..ab665a49a9 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1537,9 +1537,12 @@ class User implements IDBAccessObject {
 		foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
 			$defOpt[$langCode == $wgContLang->getCode() ? 'variant' : "variant-$langCode"] = $langCode;
 		}
-		$namespaces = MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
-		foreach ( $namespaces as $nsnum => $nsname ) {
-			$defOpt['searchNs' . $nsnum] = !empty( $wgNamespacesToBeSearchedDefault[$nsnum] );
+
+		// NOTE: don't use SearchEngineConfig::getSearchableNamespaces here,
+		// since extensions may change the set of searchable namespaces depending
+		// on user groups/permissions.
+		foreach ( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
+			$defOpt['searchNs' . $nsnum] = (boolean)$val;
 		}
 		$defOpt['skin'] = Skin::normalizeKey( $wgDefaultSkin );