EntityMalformedException PATCH
http://drupal.org/node/1595358 Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
@@ -82,10 +82,17 @@ function _term_reference_tree_get_term_hierarchy($tid, $vid, &$allowed, $filter,
|
||||
|
||||
$result = array();
|
||||
|
||||
$vocab = taxonomy_vocabulary_load( $vid );
|
||||
|
||||
if ($filter != '') {
|
||||
foreach($allowed as $k => $v) {
|
||||
if (array_key_exists($k, $terms)) {
|
||||
$term =& $terms[$k];
|
||||
|
||||
if ( !isset($term->vocabulary_machine_name) && !empty($vocab) ) {
|
||||
$term->vocabulary_machine_name = $vocab->machine_name;
|
||||
}
|
||||
|
||||
$children = _term_reference_tree_get_term_hierarchy($term->tid, $vid, $allowed, $filter, $label, $default);
|
||||
if (is_array($children)) {
|
||||
$term->children = $children;
|
||||
@@ -102,6 +109,11 @@ function _term_reference_tree_get_term_hierarchy($tid, $vid, &$allowed, $filter,
|
||||
else {
|
||||
foreach($terms as &$term) {
|
||||
if ($filter == '' || array_key_exists($term->tid, $allowed)) {
|
||||
|
||||
if ( !isset($term->vocabulary_machine_name) && !empty($vocab) ) {
|
||||
$term->vocabulary_machine_name = $vocab->machine_name;
|
||||
}
|
||||
|
||||
$children = _term_reference_tree_get_term_hierarchy($term->tid, $vid, $allowed, $filter, $label, $default);
|
||||
if (is_array($children)) {
|
||||
$term->children = $children;
|
||||
|
||||
Reference in New Issue
Block a user