Index: modules/aggregator/aggregator.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v retrieving revision 1.11 diff -u -r1.11 aggregator.admin.inc --- modules/aggregator/aggregator.admin.inc 3 Aug 2008 05:46:55 -0000 1.11 +++ modules/aggregator/aggregator.admin.inc 10 Aug 2008 21:47:43 -0000 @@ -305,25 +305,23 @@ foreach ($feeds as $feed) { $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url = '%s'", $feed['title'], $feed['url']); - $duplicate = FALSE; while ($old = db_fetch_object($result)) { if (strcasecmp($old->title, $feed['title']) == 0) { drupal_set_message(t('A feed named %title already exists.', array('%title' => $old->title)), 'warning'); - $duplicate = TRUE; - continue; + continue 2; } if (strcasecmp($old->url, $feed['url']) == 0) { drupal_set_message(t('A feed with the URL %url already exists.', array('%url' => $old->url)), 'warning'); - $duplicate = TRUE; - continue; + continue 2; } } - if (!$duplicate) { - $form_state['values']['title'] = $feed['title']; - $form_state['values']['url'] = $feed['url']; - drupal_execute('aggregator_form_feed', $form_state); - } + + $form_state['values']['title'] = $feed['title']; + $form_state['values']['url'] = $feed['url']; + drupal_execute('aggregator_form_feed', $form_state); } + + $form_state['redirect'] = 'admin/content/aggregator'; } /**