diff options
| -rw-r--r-- | toolkit/content/aboutRights.xhtml | 3 | ||||
| -rw-r--r-- | toolkit/content/aboutTelemetry.js | 4 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/global/aboutRights.dtd | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml index c0c73d761..0d42e6fad 100644 --- a/toolkit/content/aboutRights.xhtml +++ b/toolkit/content/aboutRights.xhtml @@ -47,6 +47,7 @@ <div id="disabling-webservices-container" style="margin-left:40px;"> <a name="disabling-webservices"/> +#ifdef MOZ_SAFE_BROWSING <p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p> <ul> <li>&rights.safebrowsing-term1;</li> @@ -54,7 +55,7 @@ <li>&rights2.safebrowsing-term3;</li> <li>&rights.safebrowsing-term4;</li> </ul> - +#endif <p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p> <ul> <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li> diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js index 2cf5e8909..c73a979c6 100644 --- a/toolkit/content/aboutTelemetry.js +++ b/toolkit/content/aboutTelemetry.js @@ -75,6 +75,10 @@ function isFlatArray(obj) { * This is a helper function for explodeObject. */ function flattenObject(obj, map, path, array) { + if (!obj) { + return; + } + for (let k of Object.keys(obj)) { let newPath = [...path, array ? "[" + k + "]" : k]; let v = obj[k]; diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd index 28b24e1d8..dfd5a1668 100644 --- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd @@ -65,7 +65,7 @@ <!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites. If you wish to disable the feature completely, follow these steps:"> <!ENTITY rights.safebrowsing-term1 "Open the application preferences"> <!ENTITY rights.safebrowsing-term2 "Select the Security selection"> -<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to "&enableSafeBrowsing.label;""> +<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to enable Safe Browsing"> <!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled"> <!-- location aware browsing points for branded builds --> |