diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 15 | ||||
| -rw-r--r-- | includes/theme.inc | 2 |
2 files changed, 15 insertions, 2 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"); } } |