- Patch #141204 by Wim Leers: fixing caching bug in taxonomy_node_get_terms().
parent
f0b273a965
commit
304400293a
|
@ -774,14 +774,14 @@ function taxonomy_node_get_terms_by_vocabulary($node, $vid, $key = 'tid') {
|
||||||
function taxonomy_node_get_terms($node, $key = 'tid') {
|
function taxonomy_node_get_terms($node, $key = 'tid') {
|
||||||
static $terms;
|
static $terms;
|
||||||
|
|
||||||
if (!isset($terms[$node->vid])) {
|
if (!isset($terms[$node->vid][$key])) {
|
||||||
$result = db_query(db_rewrite_sql('SELECT t.* FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.vid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $node->vid);
|
$result = db_query(db_rewrite_sql('SELECT t.* FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.vid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $node->vid);
|
||||||
$terms[$node->vid] = array();
|
$terms[$node->vid][$key] = array();
|
||||||
while ($term = db_fetch_object($result)) {
|
while ($term = db_fetch_object($result)) {
|
||||||
$terms[$node->vid][$term->$key] = $term;
|
$terms[$node->vid][$key][$term->$key] = $term;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $terms[$node->vid];
|
return $terms[$node->vid][$key];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue