diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-05-24 11:19:00 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-05-24 11:19:00 +0000 |
| commit | c08eafe0eee16f3838070910b19122f77c293096 (patch) | |
| tree | 529a4a6347f5860528d847a0124deae642dc4383 | |
| parent | ff6a9390f00e58dac25fd7e4a19789992b618533 (diff) | |
| download | brdo-c08eafe0eee16f3838070910b19122f77c293096.tar.gz brdo-c08eafe0eee16f3838070910b19122f77c293096.tar.bz2 | |
- Patch #46290 by Neil, Egon, et al: when deleting a book page under 'orphan pages' we are returned to the homepage.
| -rw-r--r-- | modules/book.module | 3 | ||||
| -rw-r--r-- | modules/book/book.module | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/book.module b/modules/book.module index fb61ac070..27b07dd4b 100644 --- a/modules/book.module +++ b/modules/book.module @@ -886,12 +886,13 @@ function theme_book_admin_table($form) { $rows = array(); foreach (element_children($form) as $key) { $nid = $form[$key]['nid']['#value']; + $pid = $form[0]['nid']['#value']; $rows[] = array( '<div style="padding-left: '. (25 * $form[$key]['depth']['#value']) .'px;">'. form_render($form[$key]['title']) .'</div>', form_render($form[$key]['weight']), l(t('view'), 'node/'. $nid), l(t('edit'), 'node/'. $nid .'/edit'), - l(t('delete'), 'node/'. $nid .'/delete') + l(t('delete'), 'node/'. $nid .'/delete', NULL, 'destination=admin/node/book'. (arg(3) == 'orphan' ? '/orphan' : '') . ($pid != $nid ? '/'.$pid : '')) ); } diff --git a/modules/book/book.module b/modules/book/book.module index fb61ac070..27b07dd4b 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -886,12 +886,13 @@ function theme_book_admin_table($form) { $rows = array(); foreach (element_children($form) as $key) { $nid = $form[$key]['nid']['#value']; + $pid = $form[0]['nid']['#value']; $rows[] = array( '<div style="padding-left: '. (25 * $form[$key]['depth']['#value']) .'px;">'. form_render($form[$key]['title']) .'</div>', form_render($form[$key]['weight']), l(t('view'), 'node/'. $nid), l(t('edit'), 'node/'. $nid .'/edit'), - l(t('delete'), 'node/'. $nid .'/delete') + l(t('delete'), 'node/'. $nid .'/delete', NULL, 'destination=admin/node/book'. (arg(3) == 'orphan' ? '/orphan' : '') . ($pid != $nid ? '/'.$pid : '')) ); } |