summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2003-01-06 21:24:21 +0000
committerDries Buytaert <dries@buytaert.net>2003-01-06 21:24:21 +0000
commit2647a943f05eb640e4d6656aa9272d572d8130e0 (patch)
tree86692975511364dc047184fb6d8648a3ba996064 /includes/common.inc
parenta380356d6eb8cc7b8d749ec6f243feb22d1b8357 (diff)
downloadbrdo-2647a943f05eb640e4d6656aa9272d572d8130e0.tar.gz
brdo-2647a943f05eb640e4d6656aa9272d572d8130e0.tar.bz2
- Forgot to update the taxonomy links. Reported by Adam.
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc15
1 files changed, 14 insertions, 1 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) {