diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-03-13 21:04:43 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-03-13 21:04:43 +0000 |
| commit | 3b70f0015f27f325036a708772fadbe381fe788f (patch) | |
| tree | 373b4e1e0257c46989d476cb35ea838a0a7c777c | |
| parent | a666c7da9e6ab1d0c2f73ed5bd6b7245c47e81e6 (diff) | |
| download | brdo-3b70f0015f27f325036a708772fadbe381fe788f.tar.gz brdo-3b70f0015f27f325036a708772fadbe381fe788f.tar.bz2 | |
- Patch #18787 by nysus: when trying to delete a forum or container, multiple instances of a Drupal page appear nested inside of each other when the confirmation of deletion page is displayed.
| -rw-r--r-- | modules/forum.module | 6 | ||||
| -rw-r--r-- | modules/forum/forum.module | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/forum.module b/modules/forum.module index 23078fdc6..96d18a785 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -85,7 +85,7 @@ function forum_admin() { break; case t('Delete'): if (!$edit['confirm']) { - $output = _forum_confirm_del($edit['tid']); + $output = _forum_confirm_delete($edit['tid']); break; } else { @@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) { * * @param $tid ID of the term to be deleted */ -function _forum_confirm_del($tid) { +function _forum_confirm_delete($tid) { $term = taxonomy_get_term($tid); $extra = form_hidden('tid', $tid); @@ -136,7 +136,7 @@ function _forum_confirm_del($tid) { t('Delete'), t('Cancel'), $extra); - print theme('page', $output); + return $output; } /** diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 23078fdc6..96d18a785 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -85,7 +85,7 @@ function forum_admin() { break; case t('Delete'): if (!$edit['confirm']) { - $output = _forum_confirm_del($edit['tid']); + $output = _forum_confirm_delete($edit['tid']); break; } else { @@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) { * * @param $tid ID of the term to be deleted */ -function _forum_confirm_del($tid) { +function _forum_confirm_delete($tid) { $term = taxonomy_get_term($tid); $extra = form_hidden('tid', $tid); @@ -136,7 +136,7 @@ function _forum_confirm_del($tid) { t('Delete'), t('Cancel'), $extra); - print theme('page', $output); + return $output; } /** |