Index: subscriptions.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions.admin.inc,v
retrieving revision 1.13
diff -u -r1.13 subscriptions.admin.inc
--- subscriptions.admin.inc	1 Aug 2008 15:28:06 -0000	1.13
+++ subscriptions.admin.inc	4 Aug 2008 14:56:29 -0000
@@ -282,7 +282,7 @@
   // Build summary
   $uid = (isset($account) ? $account->uid : -DRUPAL_AUTHENTICATED_RID);
   $counts = array();
-  $result = db_query("SELECT module, field, count(1) as number FROM {subscriptions} WHERE recipient_uid = %d GROUP BY module, field", $uid);
+  $result = db_query("SELECT s.module, s.field, COUNT(1) as number FROM {subscriptions} s WHERE s.recipient_uid = %d AND ((s.field = 'nid' AND EXISTS (SELECT n.nid FROM {node} n WHERE n.nid = s.value)) OR (s.field = 'tid' AND EXISTS (SELECT t.tid FROM {term_data} t WHERE t.tid = s.value)) OR (s.field = 'type' AND EXISTS (SELECT nt.type FROM {node_type} nt WHERE nt.type = s.value)) OR (NOT (s.field = 'nid') AND NOT (s.field = 'tid') AND NOT (s.field = 'type'))) GROUP BY s.module, s.field", $uid);
   while ($subs = db_fetch_object($result)) {
     if (!empty($subs->module)) {
       $counts[$subs->module][$subs->field] = $subs->number;
@@ -309,7 +309,6 @@
     }
   }
   $output  = theme('table', $header, $rows);
-  $output .= theme('item', array('#value' => '', '#description' => t('Note: The counts on this page may differ from the ones on the detail pages for various technical reasons.')));
   $output .= '<br />';
 
   $output .= drupal_get_form('subscriptions_user_settings_form', $account);
Index: subscriptions_blog_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions_blog_ui.module,v
retrieving revision 1.3
diff -u -r1.3 subscriptions_blog_ui.module
--- subscriptions_blog_ui.module	22 Jun 2008 14:12:54 -0000	1.3
+++ subscriptions_blog_ui.module	4 Aug 2008 14:48:16 -0000
@@ -151,6 +151,6 @@
  * @ingroup hooks
  */
 function subscriptions_blog_ui_count_user_subscriptions($counts, $uid) {
-  $counts['blog']['author_uid'] = db_result(db_query("SELECT count(*) FROM {subscriptions} WHERE module = 'node' AND field = 'type' AND value = 'blog' AND recipient_uid = %d", $uid));
+  $counts['blog']['author_uid'] = db_result(db_query(" SELECT count(*) FROM {subscriptions} s WHERE module = 'node' AND field = 'type' AND value = 'blog' AND recipient_uid = %d AND EXISTS (SELECT n.uid FROM {node} n WHERE n.uid = s.author_uid LIMIT 1)", $uid));
   return $counts;
 }