@@ -866,16 +874,20 @@ function taxonomy_get_term_by_name($name) {
* Return the vocabulary object matching a vocabulary ID.
*/
functiontaxonomy_get_vocabulary($vid){
$result=db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name',$vid);
$node_types=array();
while($voc=db_fetch_object($result)){
$node_types[]=$voc->type;
unset($voc->type);
$voc->nodes=$node_types;
$vocabulary=$voc;
static$vocabularies=array();
if(!array_key_exists($vid,$vocabularies)){
$result=db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name',$vid);
@@ -866,16 +874,20 @@ function taxonomy_get_term_by_name($name) {
* Return the vocabulary object matching a vocabulary ID.
*/
functiontaxonomy_get_vocabulary($vid){
$result=db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name',$vid);
$node_types=array();
while($voc=db_fetch_object($result)){
$node_types[]=$voc->type;
unset($voc->type);
$voc->nodes=$node_types;
$vocabulary=$voc;
static$vocabularies=array();
if(!array_key_exists($vid,$vocabularies)){
$result=db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name',$vid);