--- drupal_orig/modules/vocabulary_list.module	2004-07-04 18:05:17.000000000 +0200
+++ drupal/modules/vocabulary_list.module	2004-08-29 11:32:52.000000000 +0200
@@ -3,19 +3,27 @@
 
 function vocabulary_list_help($section) {
   $help = t('Provides pages and feeds for vocabularies');
-  if ($section == "admin/system/modules#description") {
+  if ($section == "admin/modules#description") {
     return $help;
   }
-  elseif ($section == "admin/help#commentrss") {
+  elseif ($section == "admin/help#vocabulary_list") {
     return "<p>$help</p>";
   }
 }
 
-function vocabulary_list_link($type) {
-  if ($type == "system" && user_access("access content")) {
-    menu("taxonomy/page/vocab", t("vocabulary"), "vocabulary_list_page", 0, MENU_HIDE);
-    menu("taxonomy/feed/vocab", t("vocabulary"), "vocabulary_list_page", 0, MENU_HIDE);
-  }
+function vocabulary_list_menu() {
+  $items = array();
+  
+  $items[] = array('path' => 'taxonomy/page/vocab', 'title' => t('vocabulary'),
+    'callback' => 'vocabulary_list_page',
+    'access' => user_access('access content'),
+    'type' => MENU_CALLBACK);
+  $items[] = array('path' => 'taxonomy/feed/vocab', 'title' => t('vocabulary'),
+    'callback' => 'vocabulary_list_page',
+    'access' => user_access('access content'),
+    'type' => MENU_CALLBACK);
+
+  return $items;
 }
 
 function vocabulary_list_page() {
@@ -23,7 +31,7 @@
   $isfeed = (arg(1) == 'feed');
   
   $vocab = taxonomy_get_vocabulary($vocabid);
-  $SQL = "SELECT DISTINCT(n.nid), n.type, n.created, n.changed, n.uid, n.static, u.name FROM {node} n, {term_node} tn, {term_data} td, {users} u WHERE n.nid = tn.nid AND tn.tid = td.tid AND n.uid = u.uid AND n.status = '1' AND td.vid = '$vocabid' ORDER BY static DESC, created DESC";
+  $SQL = "SELECT DISTINCT(n.nid), n.type, n.created, n.changed, n.uid, u.name FROM {node} n, {term_node} tn, {term_data} td, {users} u WHERE n.nid = tn.nid AND tn.tid = td.tid AND n.uid = u.uid AND n.status = '1' AND td.vid = '$vocabid' ORDER BY n.sticky DESC, created DESC";
     
   // Handle output to RSS feed via node_feed()
   if ($isfeed) {