From ab5cdfda6134cca2b1981b8507aa23c43c165b3b Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 8 Aug 2008 20:09:22 +0000 Subject: - Patch #268491 by mustafu, pwolanin, et al: fixed notice after deleting aggregator feed. --- modules/aggregator/aggregator.module | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 58be0c117..a23856379 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -375,6 +375,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'; } @@ -415,6 +417,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']); -- cgit v1.2.3