From 78bc68f304b83a965e4223887d9443eb12bf91b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Thu, 10 Jan 2008 22:47:17 +0000 Subject: Drupal 6 RC2 --- modules/aggregator/aggregator.admin.inc | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'modules/aggregator/aggregator.admin.inc') diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index 9d78e5491..2f1485cf5 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -176,15 +176,31 @@ function aggregator_form_feed_submit($form, &$form_state) { } } +function aggregator_admin_remove_feed($form_state, $feed) { + return confirm_form( + array( + 'feed' => array( + '#type' => 'value', + '#value' => $feed, + ), + ), + t('Are you sure you want to remove all items from the feed %feed?', array('%feed' => $feed['title'])), + 'admin/content/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. + * Remove all items from a feed and redirect to the overview page. * * @param $feed * An associative array describing the feed to be cleared. */ -function aggregator_admin_remove_feed($feed) { - aggregator_remove($feed); - drupal_goto('admin/content/aggregator'); +function aggregator_admin_remove_feed_submit($form, &$form_state) { + aggregator_remove($form_state['values']['feed']); + $form_state['redirect'] = 'admin/content/aggregator'; } /** -- cgit v1.2.3