Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 16 insertions, 4 deletions

diff --git a/application/palemoon/base/content/sync/quota.js b/application/palemoon/base/content/sync/quota.js
index 454052754..1285a8d54 100644
--- a/application/palemoon/base/content/sync/quota.js
+++ b/application/palemoon/base/content/sync/quota.js
@@ -193,10 +193,15 @@ var gUsageTreeView = {
       return;
     }
 
-    toremove = [this._byname[coll].title for each (coll in toremove)];
-    toremove = toremove.join(gSyncQuota.bundle.getString("quota.list.separator"));
+    // Tycho: toremove = [this._byname[coll].title for each (coll in toremove)];
+    let toremovetitles = [];
+    for (let coll in toremove) {
+      toremovetitles.push(this._byname[coll].title);
+    }
+    
+    toremovetitles = toremovetitles.join(gSyncQuota.bundle.getString("quota.list.separator"));
     caption.firstChild.nodeValue = gSyncQuota.bundle.getFormattedString(
-      "quota.removal.label", [toremove]);
+      "quota.removal.label", [toremovetitles]);
     if (freeup)
       caption.firstChild.nodeValue += gSyncQuota.bundle.getFormattedString(
         "quota.freeup.label", gSyncQuota.convertKB(freeup));
@@ -208,7 +213,14 @@ var gUsageTreeView = {
    * disabled.
    */
   getEnginesToDisable: function getEnginesToDisable() {
-    return [coll.name for each (coll in this._collections) if (!coll.enabled)];
+    // Tycho: return [coll.name for each (coll in this._collections) if (!coll.enabled)];
+    let engines = [];
+    for each (let coll in this._collections) {
+      if (!coll.enabled) {
+        engines.push(coll.name);
+      }
+    }
+    return engines;
   },
 
   // nsITreeView