- Forgot to update the taxonomy links. Reported by Adam.

includes/common.inc

@@ -748,7 +748,20 @@ function drupal_parse_url($url = NULL) {
 }
 
 function url($url, $query = NULL) {
-  return "?q=$url". ($query ? "&$query" : "");
+
+  if ($url) {
+    if ($query) {
+      return "?q=$url&$query";
+    }
+    else {
+      return "?q=$url";
+    }
+  }
+  else {
+    if ($query) {
+      return "?$query";
+    }
+  }
 }
 
 function l($text, $url, $attributes = array(), $query = NULL) {

includes/theme.inc

@@ -42,7 +42,7 @@ class BaseTheme {
   function node($node, $main) {
     if (function_exists("taxonomy_node_get_terms")) {
       foreach (taxonomy_node_get_terms($node->nid) as $term) {
-        $terms[] = l($term->name, array("or" => $term->tid), "index");
+        $terms[] = l($term->name, NULL, NULL, "or=$term->tid");
       }
     }
 

themes/goofy/goofy.theme

@@ -121,7 +121,7 @@ function c(subject,mod,author,date,body) {document.writeln("<table border=\"0\"
         if ($terms = taxonomy_node_get_terms($node->nid)) {
           $taxlinks = array();
           foreach ($terms as $term) {
-            $taxlinks[] = l($term->name, array("or" => $term->tid), "index");
+            $taxlinks[] = l($term->name, NULL, NULL, "or=$term->tid");
           }
           $subright = $this->links($taxlinks);
         }

themes/marvin/marvin.theme

@@ -88,7 +88,7 @@
 
      if (function_exists("taxonomy_node_get_terms")) {
        foreach (taxonomy_node_get_terms($node->nid) as $term) {
-         $terms[] = l($term->name, array("or" => $term->tid), "index");
+         $terms[] = l($term->name, NULL, array(), "or=$term->tid");
        }
      }
 

themes/unconed/unconed.theme

@@ -105,7 +105,7 @@
               if ($terms = taxonomy_node_get_terms($node->nid)) {
                 $taxlinks = array();
                 foreach ($terms as $term) {
-                  $taxlinks[] = l($term->name, array("or" => $term->tid), "index");
+                  $taxlinks[] = l($term->name, NULL, NULL, "or=$term->tid");
                 }
                 $taxo = $this->links($taxlinks);
               }