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) {