diff options
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/aboutRights.xhtml | 3 | ||||
| -rw-r--r-- | toolkit/content/aboutTelemetry.js | 4 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 4 |
3 files changed, 8 insertions, 3 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/content/jar.mn b/toolkit/content/jar.mn index acec1bdf1..ca1a602a9 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -13,9 +13,9 @@ toolkit.jar: content/global/aboutAbout.js content/global/aboutAbout.xhtml #ifdef MC_OFFICIAL - content/global/aboutRights.xhtml +* content/global/aboutRights.xhtml #else - content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) +* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) #endif content/global/aboutNetworking.js content/global/aboutNetworking.xhtml |