diff options
| -rw-r--r-- | includes/common.inc | 15 | ||||
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | themes/goofy/goofy.theme | 2 | ||||
| -rw-r--r-- | themes/marvin/marvin.theme | 2 | ||||
| -rw-r--r-- | themes/unconed/unconed.theme | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/includes/common.inc b/includes/common.inc index 4a3602d19..4890b2776 100644 --- a/includes/common.inc +++ b/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) { diff --git a/includes/theme.inc b/includes/theme.inc index 46811a331..c851b3283 100644 --- a/includes/theme.inc +++ b/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"); } } diff --git a/themes/goofy/goofy.theme b/themes/goofy/goofy.theme index 91da5e2e1..68f727c93 100644 --- a/themes/goofy/goofy.theme +++ b/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); } diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index 27c425b38..164ff80fd 100644 --- a/themes/marvin/marvin.theme +++ b/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"); } } diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme index 536907f07..74c050bab 100644 --- a/themes/unconed/unconed.theme +++ b/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); } |