--- a/modules/aggregator/aggregator.module	Tue Dec 23 14:30:28 2008 +0100
+++ b/modules/aggregator/aggregator.module	Tue Dec 23 14:32:08 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: aggregator.module,v 1.374.2.2 2008/07/05 05:57:33 dries Exp $
+// $Id: aggregator.module,v 1.374.2.3 2008/08/08 20:10:01 dries Exp $
 
 /**
  * @file
@@ -381,6 +381,8 @@
     }
     else {
       db_query('DELETE FROM {aggregator_category} WHERE cid = %d', $edit['cid']);
+      // Make sure there is no active block for this category.
+      db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'category-' . $edit['cid']);
       $edit['title'] = '';
       $op = 'delete';
     }
@@ -421,6 +423,8 @@
     }
     db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']);
     db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
+    // Make sure there is no active block for this feed.
+    db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'feed-' . $edit['fid']);
   }
   else if (!empty($edit['title'])) {
     db_query("INSERT INTO {aggregator_feed} (title, url, refresh, block, description, image) VALUES ('%s', '%s', %d, 5, '', '')", $edit['title'], $edit['url'], $edit['refresh']);