Add the correct amount of slashes if the application is installed at the

document root.

Add the correct amount of slashes if the application is installed at the
document root.
e6383621 · Nigel McNie · Nigel McNie · 29ca4f80 · e6383621
Commit e6383621 authored Oct 07, 2006 by Nigel McNie Committed by Nigel McNie Oct 07, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

htdocs/init.php htdocs/init.php +5 -1

No files found.
--- a/htdocs/init.php
+++ b/htdocs/init.php
@@ -56,7 +56,11 @@ foreach (array('docroot', 'dataroot') as $path) {
 if (!isset($CFG->wwwroot)) {
    $proto = (isset($_SERVER['HTTPS'])) ? 'https://' : 'http://';
    $host =  (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
-    $CFG->wwwroot = $proto . $host . '/' . substr(dirname(__FILE__), strlen($_SERVER['DOCUMENT_ROOT'])). '/';
+    $path = substr(dirname(__FILE__), strlen($_SERVER['DOCUMENT_ROOT']));
+    if ($path) {
+        $path .= '/';
+    }
+    $CFG->wwwroot = $proto . $host . '/' . $path;
 }

 // core libraries