--- contributions/modules/taxonomy_dhtml/taxonomy_dhtml.module	2004-10-27 04:34:04.222614621 -0400
+++ ../democrats.com/www/modules/taxonomy_dhtml/taxonomy_dhtml.module	2004-10-27 04:29:41.003184262 -0400
@@ -1,5 +1,5 @@
 <?php
-// $Id: taxonomy_dhtml.module,v 1.51 2004/10/21 15:34:33 weitzman Exp $
+// $Id: taxonomy_dhtml.module,v 1.51.2.1 2004/10/21 15:35:23 weitzman Exp $
 
 function taxonomy_dhtml_set_head() {
   global $base_url;
@@ -46,7 +46,7 @@ function taxonomy_dhtml_block($op = "lis
 }
 
 
-function taxonomy_dhtml_vocab_vert($vocabulary_id, $op = "view", $type = 0) {
+function taxonomy_dhtml_vocab_vert($vocabulary_id, $op = "", $depth = 0) {
   $tree = taxonomy_get_tree($vocabulary_id);
   // build an array which holds all children of current term. necessary to build a proper 'or' value in the HREF
   foreach ($tree as $term) {
@@ -57,7 +57,7 @@ function taxonomy_dhtml_vocab_vert($voca
         $family[] = $child->tid;
       }
     }
-    $link = l(t($term->name), "taxonomy/$op/or/". implode($family, ","). ($type !== 0 ? "/$type" : ""), array("title" => t($term->description)));
+    $link = l(t($term->name), "taxonomy/term/". implode($family, "+") .'/'. $depth . ($op?'/'.$op:''), array("title" => t($term->description)));
 
     unset($family);
 
@@ -150,9 +150,9 @@ function taxonomy_dhtml_syndication() {
       $names[] = $term->name;
     }
     if ($tids && $names) {
-      $tids = implode(",", $tids);
+      $tids = implode("+", $tids);
       $names = implode(", ", $names);
-      $link = l($names, "taxonomy/feed/or/$tids");
+      $link = l($names, "taxonomy/term/$tids");
       $output = t("<p>The feeds above may be mixed by listing term IDs at the end of the url. ");
       $output .= t(" ID's should be separated by commas. For example, here is a feed for %s</p>", array ("%s" => $link));
       $box[$i]["content"]= taxonomy_dhtml_vocab_vert($vocabulary->vid, "feed"). $output;