Issue 3907 - Make sure that the title of Acceptable Ads subscription used

options.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 47 matching lines @@
   {
     var access = (item.url || item.text).replace(/'/g, "\\'");
     return function(container)
     {
       return container.querySelector("[data-access='" + access + "']");
     };
   };
 
   Collection.prototype._getItemTitle = function(item, i)
   {
-    var title = null;
-    if (this.details[i].useOriginalTitle)
-      title = item.originalTitle;
-    if (!title)
-      title = item.title || item.url || item.text;
-    return title;
+    if (item.url == acceptableAdsUrl)
+      return getMessage("options_acceptableAds_description");
+    if (this.details[i].useOriginalTitle && item.originalTitle)
+      return item.originalTitle;
+    return item.title || item.url || item.text;
   };
 
   Collection.prototype.addItems = function() 
   {
     var length = Array.prototype.push.apply(this.items, arguments);
     if (length == 0)
       return;
 
     this.items.sort(function(a, b)
     {
@@ skipping 781 matching lines @@
     ext.backgroundPage.sendMessage(
     {
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
     function(url)
     {
       acceptableAdsUrl = url;
       updateSubscription({
         url: acceptableAdsUrl,
-        disabled: true,
-        title: getMessage("options_acceptableAds_description")
+        disabled: true
       });
 
       // Load user subscriptions
       ext.backgroundPage.sendMessage(
       {
         type: "subscriptions.get",
         downloadable: true
       }, 
       function(subscriptions)
       {
@@ skipping 266 matching lines @@
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
         "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();