Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Omit "index.php" when using Apache. Patch by Al.

4.2.x
Dries Buytaert 2003-05-31 13:05:06 +00:00
parent 39f6a9e79a
commit 82019d89fb
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
includes/common.inc
View File

@ -840,18 +840,29 @@ function form_weight($title = NULL, $name = "weight", $value = 0, $delta = 10, $
function url($url = NULL, $query = NULL) { function url($url = NULL, $query = NULL) {
global $base_url; global $base_url;
static $script;
if (empty($script)) {
/*
** On some webservers such as IIS we can't omit "index.php". As such we
** generate "index.php?q=foo" instead of "?q=foo" on anything that is not
** Apache.
*/
$script = (strpos($_SERVER["SERVER_SOFTWARE"], "Apache") === false) ? "index.php" : "";
}
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 "$base_url/index.php?q=$url&$query"; return "$base_url/$script?q=$url&$query";
} }
else { else {
return "$base_url/index.php?q=$url"; return "$base_url/$script?q=$url";
} }
} }
else { else {
if (isset($query)) { if (isset($query)) {
return "$base_url/index.php?$query"; return "$base_url/$script?$query";
} }
else { else {
return "$base_url/"; return "$base_url/";
@ -869,7 +880,7 @@ function url($url = NULL, $query = NULL) {
} }
else { else {
if (isset($query)) { if (isset($query)) {
return "$base_url/index.php?$query"; return "$base_url/$script?$query";
} }
else { else {
return "$base_url/"; return "$base_url/";