Commit 38eef18e authored by Dries's avatar Dries
Browse files

- Patch #19615 by chx: fixed problem forum container getting lets when editing a forum.

parent 0f41706a
......@@ -193,6 +193,14 @@ function forum_form_forum($edit = array()) {
function _forum_parent_select($tid, $title, $name) {
$parents = taxonomy_get_parents($tid);
if ($parents) {
$parent = array_shift($parents);
$parent = $parent->tid;
}
else {
$parent = 0;
}
$children = taxonomy_get_tree(_forum_get_vid, $tid);
// A term can't be the child of itself, nor of its children.
......@@ -211,11 +219,7 @@ function _forum_parent_select($tid, $title, $name) {
}
}
if (!$parents) {
$parents = 0;
}
return form_select($title, $name, $parents, $options, NULL, 0, FALSE, TRUE);
return form_select($title, $name, $parent, $options, NULL, 0, FALSE, TRUE);
}
/**
......
......@@ -193,6 +193,14 @@ function forum_form_forum($edit = array()) {
function _forum_parent_select($tid, $title, $name) {
$parents = taxonomy_get_parents($tid);
if ($parents) {
$parent = array_shift($parents);
$parent = $parent->tid;
}
else {
$parent = 0;
}
$children = taxonomy_get_tree(_forum_get_vid, $tid);
// A term can't be the child of itself, nor of its children.
......@@ -211,11 +219,7 @@ function _forum_parent_select($tid, $title, $name) {
}
}
if (!$parents) {
$parents = 0;
}
return form_select($title, $name, $parents, $options, NULL, 0, FALSE, TRUE);
return form_select($title, $name, $parent, $options, NULL, 0, FALSE, TRUE);
}
/**
......
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