Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/sendReport.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 739 matching lines @@
         list.removeChild(list.lastChild);
 
       for (let i = 0; i < this.outdated.length; i++)
       {
         let subscription = this.outdated[i];
         let entry = template.cloneNode(true);
         entry.removeAttribute("id");
         entry.removeAttribute("hidden");
         entry.setAttribute("_url", subscription.url);
         entry.setAttribute("tooltiptext", subscription.url);
-        entry.textContent = subscription.title;
+        entry.textContent = getSubscriptionTitle(subscription);
         list.appendChild(entry);
       }
     }
     return !E("updateInProgress").hidden || !E("outdatedSubscriptions").hidden;
   },
 
   showPage: function()
   {
     document.documentElement.canAdvance = false;
 
@@ skipping 218 matching lines @@
 
     let disabledSubscriptionsBox = E("issuesDisabledSubscriptions");
     if (this.disabledSubscriptions.length && !disabledSubscriptionsBox.firstChild)
     {
       let template = E("issuesDisabledSubscriptionsTemplate");
       for (let subscription of this.disabledSubscriptions)
       {
         let element = template.cloneNode(true);
         element.removeAttribute("id");
         element.removeAttribute("hidden");
-        element.firstChild.setAttribute("value", subscription.title);
-        element.setAttribute("tooltiptext", subscription instanceof DownloadableSubscription ? subscription.url : subscription.title);
+        element.firstChild.setAttribute("value", getSubscriptionTitle(subscription));
+        element.setAttribute("tooltiptext", subscription instanceof DownloadableSubscription ? subscription.url : getSubscriptionTitle(subscription));
         element.abpSubscription = subscription;
         disabledSubscriptionsBox.appendChild(element);
       }
     }
     E("issuesDisabledSubscriptionsBox").hidden = (type != "false negative" || this.disabledSubscriptions.length == 0);
 
     let disabledFiltersBox = E("issuesDisabledFilters");
     if (this.disabledFilters.length && !disabledFiltersBox.firstChild)
     {
       let template = E("issuesDisabledFiltersTemplate");
@@ skipping 543 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }