Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.380
diff -u -p -r1.380 aggregator.module
--- modules/aggregator/aggregator.module	15 May 2008 21:27:32 -0000	1.380
+++ modules/aggregator/aggregator.module	9 Jun 2008 16:52:32 -0000
@@ -365,6 +365,8 @@ function aggregator_save_category($edit)
     }
     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';
     }
@@ -405,6 +407,8 @@ function aggregator_save_feed($edit) {
     }
     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']);
   }
   elseif (!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']);