summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-01-14 22:41:15 +0000
committerDries Buytaert <dries@buytaert.net>2004-01-14 22:41:15 +0000
commitc37cfb0183b4febfc87d84e74c741dab5b3d2490 (patch)
treefe09fdcd053f4f6444eba362a1158a583cf65026 /includes/common.inc
parent6fc2070a22cda40d174db205847dca4c214eeea6 (diff)
downloadbrdo-c37cfb0183b4febfc87d84e74c741dab5b3d2490.tar.gz
brdo-c37cfb0183b4febfc87d84e74c741dab5b3d2490.tar.bz2
- Correction: I accidentically removed some $base_urls.
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc18
1 files changed, 10 insertions, 8 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 26e0d1681..c9ad82565 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -967,6 +967,8 @@ function drupal_get_normal_path($path) {
}
function url($url = NULL, $query = NULL, $fragment = NULL) {
+ global $base_url;
+
static $script;
if (empty($script)) {
@@ -989,36 +991,36 @@ function url($url = NULL, $query = NULL, $fragment = NULL) {
if (variable_get("clean_url", "0") == "0") {
if (isset($url)) {
if (isset($query)) {
- return "$script?q=$url&amp;$query$fragment";
+ return "$base_url/$script?q=$url&amp;$query$fragment";
}
else {
- return "$script?q=$url$fragment";
+ return "$base_url/$script?q=$url$fragment";
}
}
else {
if (isset($query)) {
- return "$script?$query$fragment";
+ return "$base_url/$script?$query$fragment";
}
else {
- return "$fragment";
+ return "$base_url/$fragment";
}
}
}
else {
if (isset($url)) {
if (isset($query)) {
- return "$url?$query$fragment";
+ return "$base_url/$url?$query$fragment";
}
else {
- return "$url$fragment";
+ return "$base_url/$url$fragment";
}
}
else {
if (isset($query)) {
- return "$script?$query$fragment";
+ return "$base_url/$script?$query$fragment";
}
else {
- return "$fragment";
+ return "$base_url/$fragment";
}
}
}