386c386
<   if ($vocabulary->required) {
---
>   if (!isset($vocabulary->required) || $vocabulary->required) {
457c457
<   $c = db_query("SELECT v.*, n.type FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", $type);
---
>   $c = db_query("SELECT n.*, v.weight, v.name FROM {vocabulary_node_types} n LEFT JOIN {vocabulary} v ON n.vid = v.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", $type);