Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
c37cfb01
Commit
c37cfb01
authored
Jan 14, 2004
by
Dries Buytaert
Browse files
- Correction: I accidentically removed some $base_urls.
parent
6fc2070a
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/common.inc
View file @
c37cfb01
...
...
@@ -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
&
$query$fragment
"
;
return
"
$
base_url
/
$
script
?q=
$url
&
$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
"
;
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment