issue #690 - don't consider special subscriptions when complaining about high subscription count

chrome/content/ui/sendReport.js

Index: chrome/content/ui/sendReport.js
===================================================================
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -733,6 +733,14 @@
   type: null,
   outdated: null,
   needUpdate: null,
+  
+  subscriptionFilter: function(s)
+  {
+    if (s instanceof DownloadableSubscription)
+      return subscriptionsDataSource.subscriptionFilter(s);
+    else
+      return false;
+  },
 
   collectData: function(wnd, windowURI, callback)
   {
@@ -744,7 +752,7 @@
     this.outdated = [];
     this.needUpdate = [];
 
-    let subscriptions = FilterStorage.subscriptions.filter(issuesDataSource.subscriptionFilter);
+    let subscriptions = FilterStorage.subscriptions.filter(subscriptionUpdateDataSource.subscriptionFilter);

[Wladimir Palant, 2014/07/30 05:44:35]

this.subscriptionFilter please.

[saroyanm, 2014/07/30 06:11:58]

Oops.

     for (let i = 0; i < subscriptions.length; i++)
     {
       let lastSuccess = subscriptions[i].lastSuccess;
@@ -884,7 +892,8 @@
 
   subscriptionFilter: function(s)
   {
-    if (s instanceof DownloadableSubscription)
+    if (s instanceof DownloadableSubscription && s.url != Prefs.subscriptions_exceptionsurl
+        && s.url != Prefs.subscriptions_antiadblockurl)

[Wladimir Palant, 2014/07/30 05:44:35]

Please try to keep the lines shorter than 80 characters. In this particular case
it means having each part of the condition on a separate line. Also, we
typically leave the operator (&& here) before the line break. Finally, please
add brackets around the body of the if statement here, otherwise with multiline
conditions it's not immediately obvious where the body starts.

[saroyanm, 2014/07/30 06:11:58]

Thanks, done.

       return subscriptionsDataSource.subscriptionFilter(s);
     else
       return false;