From c37cfb0183b4febfc87d84e74c741dab5b3d2490 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 14 Jan 2004 22:41:15 +0000
Subject: - Correction: I accidentically removed some $base_urls.

---
 includes/common.inc | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'includes/common.inc')

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";
       }
     }
   }
-- 
cgit v1.2.3