diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 87718a143e9d5eb9cbd26171255a7f7b711956c8..37e4b9eb0983709ff838178de4df5e0a280b88c9 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -92,7 +92,7 @@ if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not do $path=$_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias. if (! preg_match('/\/$/', $path)) $path.='/'; } - else if (preg_match('/index\.php', $_SERVER['PHP_SELF'])) + else if (preg_match('/index\.php/', $_SERVER['PHP_SELF'])) { // When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process // when using apache alias like '/dolibarr/' that point to htdocs. @@ -113,11 +113,11 @@ if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not do if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break; if ($TDir[$i] == 'dolibarr') break; if (substr($TDir[$i], -4, 4) == '.php') continue; - + $path .= '../'; } } - + header("Location: ".$path."install/index.php"); exit; }