diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 17:27:59 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 17:27:59 -0400 |
| commit | 40fc72376411587e7bf9985fb9545eca1c9aaa8e (patch) | |
| tree | ac903ee86826040650a54f972d2557d0fb99f0a2 /toolkit | |
| parent | 8757548a3e5b5cc4d159d61eb4a12c7af1be548e (diff) | |
| download | uxp-40fc72376411587e7bf9985fb9545eca1c9aaa8e.tar.gz | |
Pref try/catch block fixup. Tag #991.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/search/current/nsSearchService.js | 13 | ||||
| -rw-r--r-- | toolkit/components/search/orginal/nsSearchService.js | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/toolkit/components/search/current/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js index 66866540a7..db90e5150e 100644 --- a/toolkit/components/search/current/nsSearchService.js +++ b/toolkit/components/search/current/nsSearchService.js @@ -983,11 +983,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) { var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID", Services.appinfo.distributionID || ""); - var official; - if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL)) - official = "official"; - else - official = "unofficial"; + var official = MOZ_OFFICIAL; + try { + if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official")) + official = "official"; + else + official = "unofficial"; + } + catch (ex) { } // Custom search parameters. These are only available to default search // engines. diff --git a/toolkit/components/search/orginal/nsSearchService.js b/toolkit/components/search/orginal/nsSearchService.js index c4481df5f3..1cec5f966e 100644 --- a/toolkit/components/search/orginal/nsSearchService.js +++ b/toolkit/components/search/orginal/nsSearchService.js @@ -1024,11 +1024,14 @@ function ParamSubstitution(aParamValue, aSearchTerms, aEngine) { var distributionID = Services.prefs.getCharPref(BROWSER_SEARCH_PREF + "distributionID", MOZ_DISTRIBUTION_ID || ""); - var official; - if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official", MOZ_OFFICIAL)) - official = "official"; - else - official = "unofficial"; + var official = MOZ_OFFICIAL; + try { + if (Services.prefs.getBoolPref(BROWSER_SEARCH_PREF + "official")) + official = "official"; + else + official = "unofficial"; + } + catch (ex) { } // Custom search parameters. These are only available to default search // engines. |