Commit 3b70f001 authored by Dries's avatar Dries

- Patch #18787 by nysus: when trying to delete a forum or container, multiple...

- 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.
parent a666c7da
...@@ -85,7 +85,7 @@ function forum_admin() { ...@@ -85,7 +85,7 @@ function forum_admin() {
break; break;
case t('Delete'): case t('Delete'):
if (!$edit['confirm']) { if (!$edit['confirm']) {
$output = _forum_confirm_del($edit['tid']); $output = _forum_confirm_delete($edit['tid']);
break; break;
} }
else { else {
...@@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) { ...@@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) {
* *
* @param $tid ID of the term to be deleted * @param $tid ID of the term to be deleted
*/ */
function _forum_confirm_del($tid) { function _forum_confirm_delete($tid) {
$term = taxonomy_get_term($tid); $term = taxonomy_get_term($tid);
$extra = form_hidden('tid', $tid); $extra = form_hidden('tid', $tid);
...@@ -136,7 +136,7 @@ function _forum_confirm_del($tid) { ...@@ -136,7 +136,7 @@ function _forum_confirm_del($tid) {
t('Delete'), t('Delete'),
t('Cancel'), t('Cancel'),
$extra); $extra);
print theme('page', $output); return $output;
} }
/** /**
......
...@@ -85,7 +85,7 @@ function forum_admin() { ...@@ -85,7 +85,7 @@ function forum_admin() {
break; break;
case t('Delete'): case t('Delete'):
if (!$edit['confirm']) { if (!$edit['confirm']) {
$output = _forum_confirm_del($edit['tid']); $output = _forum_confirm_delete($edit['tid']);
break; break;
} }
else { else {
...@@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) { ...@@ -125,7 +125,7 @@ function forum_taxonomy($op, $type, $object) {
* *
* @param $tid ID of the term to be deleted * @param $tid ID of the term to be deleted
*/ */
function _forum_confirm_del($tid) { function _forum_confirm_delete($tid) {
$term = taxonomy_get_term($tid); $term = taxonomy_get_term($tid);
$extra = form_hidden('tid', $tid); $extra = form_hidden('tid', $tid);
...@@ -136,7 +136,7 @@ function _forum_confirm_del($tid) { ...@@ -136,7 +136,7 @@ function _forum_confirm_del($tid) {
t('Delete'), t('Delete'),
t('Cancel'), t('Cancel'),
$extra); $extra);
print theme('page', $output); return $output;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment