Commit c37cfb01 authored by Dries's avatar Dries

- Correction: I accidentically removed some $base_urls.
parent 6fc2070a
...@@ -967,6 +967,8 @@ function drupal_get_normal_path($path) { ...@@ -967,6 +967,8 @@ function drupal_get_normal_path($path) {
} }
function url($url = NULL, $query = NULL, $fragment = NULL) { function url($url = NULL, $query = NULL, $fragment = NULL) {
global $base_url;
static $script; static $script;
if (empty($script)) { if (empty($script)) {
...@@ -989,36 +991,36 @@ function url($url = NULL, $query = NULL, $fragment = NULL) { ...@@ -989,36 +991,36 @@ function url($url = NULL, $query = NULL, $fragment = NULL) {
if (variable_get("clean_url", "0") == "0") { if (variable_get("clean_url", "0") == "0") {
if (isset($url)) { if (isset($url)) {
if (isset($query)) { if (isset($query)) {
return "$script?q=$url&$query$fragment"; return "$base_url/$script?q=$url&$query$fragment";
} }
else { else {
return "$script?q=$url$fragment"; return "$base_url/$script?q=$url$fragment";
} }
} }
else { else {
if (isset($query)) { if (isset($query)) {
return "$script?$query$fragment"; return "$base_url/$script?$query$fragment";
} }
else { else {
return "$fragment"; return "$base_url/$fragment";
} }
} }
} }
else { else {
if (isset($url)) { if (isset($url)) {
if (isset($query)) { if (isset($query)) {
return "$url?$query$fragment"; return "$base_url/$url?$query$fragment";
} }
else { else {
return "$url$fragment"; return "$base_url/$url$fragment";
} }
} }
else { else {
if (isset($query)) { if (isset($query)) {
return "$script?$query$fragment"; return "$base_url/$script?$query$fragment";
} }
else { else {
return "$fragment"; return "$base_url/$fragment";
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment