Index: modules/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/Attic/aggregator.module,v retrieving revision 1.278.2.12 diff -u -F^f -r1.278.2.12 aggregator.module --- modules/aggregator.module 2 Jan 2007 18:05:41 -0000 1.278.2.12 +++ modules/aggregator.module 8 Jan 2008 07:33:22 -0000 @@ -995,12 +995,30 @@ function aggregator_view() { return $output; } +function aggregator_admin_remove_feed($fid) { + $feed = aggregator_get_feed($fid); + return confirm_form( + 'aggregator_admin_remove_feed', + array( + 'feed' => array( + '#type' => 'value', + '#value' => $feed, + ), + ), + t('Are you sure you want to remove all items from the feed %feed?', array('%feed' => theme('placeholder', $feed['title']))), + 'admin/aggregator', + t('This action cannot be undone.'), + t('Remove items'), + t('Cancel') + ); +} + /** - * Menu callback; removes all items from a feed, then redirects to the overview page. - */ -function aggregator_admin_remove_feed($feed) { - aggregator_remove(aggregator_get_feed($feed)); - drupal_goto('admin/aggregator'); + * Remove all items from a feed and redirect to the overview page. + */ +function aggregator_admin_remove_feed_submit($form_id, $form_values) { + aggregator_remove($form_values['feed']); + return 'admin/aggregator'; } /**