Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/filters-subscriptionactions.js

Index: chrome/content/ui/filters-subscriptionactions.js
===================================================================
--- a/chrome/content/ui/filters-subscriptionactions.js
+++ b/chrome/content/ui/filters-subscriptionactions.js
@@ -290,17 +290,17 @@ var SubscriptionActions =
   startDrag: function(/**Event*/ event, /**Node*/ node)
   {
     let data = Templater.getDataForNode(node);
     if (!data)
       return;
 
     event.dataTransfer.addElement(node);
     event.dataTransfer.setData("text/x-moz-url", data.subscription.url);
-    event.dataTransfer.setData("text/plain", data.subscription.title);
+    event.dataTransfer.setData("text/plain", getSubscriptionTitle(data.subscription));
     this.dragSubscription = data.subscription;
     event.stopPropagation();
   },
 
   /**
    * Called when something is dragged over a subscription entry or subscriptions list.
    */
   dragOver: function(/**Event*/ event)
@@ -417,17 +417,17 @@ var TitleEditor =
       return;
 
     let subscription = Templater.getDataForNode(subscriptionNode).subscription;
     if (!subscription || subscription.fixedTitle)
       return;
 
     subscriptionNode.getElementsByClassName("titleBox")[0].selectedIndex = 1;
     let editor = subscriptionNode.getElementsByClassName("titleEditor")[0];
-    editor.value = subscription.title;
+    editor.value = getSubscriptionTitle(subscription);
     editor.setSelectionRange(0, editor.value.length);
     this.subscriptionEdited = subscriptionNode;
     editor.focus();
   },
 
   /**
    * Stops editing of a subscription title.
    * @param {Boolean} save if true the entered value will be saved, otherwise dismissed