Commit 2647a943 authored by Dries's avatar Dries

- Forgot to update the taxonomy links.  Reported by Adam.
parent a380356d
......@@ -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) {
......
......@@ -42,7 +42,7 @@ function image($name) {
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");
}
}
......
......@@ -121,7 +121,7 @@ function node($node, $main = 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);
}
......
......@@ -88,7 +88,7 @@ function node($node, $main = 0) {
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");
}
}
......
......@@ -105,7 +105,7 @@ function node($node, $main = 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");
}
$taxo = $this->links($taxlinks);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment