diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 993811d9eabbbfbdef8050c10cedf4216fbd4b78..66b93b36e0ce5e4401ec751527611625eabe1e1c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ Feeds 6.x 1.0 XXXXXXX, 20XX-XX-XX --------------------------------- +- Redirect to node or import form after manual import or delete. - #663830 Aron Novak, alex_b: When download of URL failed, node w/ empty title is created. - #654728 Aron Novak: Fix parsing + data handling error with RDF 1.0 feeds. diff --git a/feeds.pages.inc b/feeds.pages.inc index d7fba550375b65ff492b32a86bfb984a63a946e9..f9784aa1cf9314d1199932843700460514f05464 100644 --- a/feeds.pages.inc +++ b/feeds.pages.inc @@ -100,6 +100,7 @@ function feeds_import_tab_form(&$form_state, $node) { $form = array(); $form['#feed_nid'] = $node->nid; $form['#importer_id'] = $importer_id; + $form['#redirect'] = 'node/'. $node->nid; return confirm_form($form, t('Import all content from feed?'), 'node/'. $node->nid, '', t('Import'), t('Cancel'), 'confirm feeds update'); } @@ -118,16 +119,16 @@ function feeds_import_tab_form_submit($form, $form_state) { */ function feeds_delete_tab_form(&$form_state, $importer_id, $node = NULL) { if (empty($node)) { - $path = 'import/'. $feed_id .'/delete-items'; + $form['#redirect'] = 'import/'. $importer_id; } else { $importer_id = feeds_get_importer_id($node->type); $form['#feed_nid'] = $node->nid; - $path = 'node/'. $node->nid; + $form['#redirect'] = 'node/'. $node->nid; } // Form cannot pass on feed object. $form['#importer_id'] = $importer_id; - return confirm_form($form, t('Delete all items from feed?'), $path, '', t('Delete'), t('Cancel'), 'confirm feeds update'); + return confirm_form($form, t('Delete all items from feed?'), $form['#redirect'], '', t('Delete'), t('Cancel'), 'confirm feeds update'); } /**