Unverified Commit 106c2973 authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
Browse files

Bug 31563: force reloading search extensions if extensions.enabledScopes has changed

parent 0a303162

toolkit/components/search/SearchService.jsm

+7 −1
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ SearchService.prototype = { 
    let locale = Services.locale.requestedLocale;

    let buildID = Services.appinfo.platformBuildID;

    let appVersion = Services.appinfo.version;

    let enabledScopes = Services.prefs.getIntPref("extensions.enabledScopes", -1);



    // Allows us to force a cache refresh should the cache format change.

    cache.version = SearchUtils.CACHE_VERSION;
@@ -988,6 +989,10 @@ SearchService.prototype = { 
    cache.appVersion = appVersion;

    cache.locale = locale;



    // Bug 31563: we want to force reloading engines if extensions.enabledScopes

    // pref changes

    cache.enabledScopes = enabledScopes;



    if (gModernConfig) {

      cache.builtInEngineList = this._searchOrder;

      // For built-in engines we don't want to store all their data in the cache
@@ -1049,7 +1054,8 @@ SearchService.prototype = { 
      !cache.engines ||

      cache.version != SearchUtils.CACHE_VERSION ||

      cache.locale != Services.locale.requestedLocale ||

      cache.buildID != buildID;

      cache.buildID != buildID ||

      cache.enabledScopes != Services.prefs.getIntPref("extensions.enabledScopes", -1);



    let enginesCorrupted = false;

    if (!rebuildCache) {