Commit ac89011b authored by drumm's avatar drumm
Browse files

#60457 by JonBob (slightly modified), bootstrap.inc produces [Notice] in error_log

parent 62320df6
...@@ -156,7 +156,10 @@ function conf_init() { ...@@ -156,7 +156,10 @@ function conf_init() {
if (isset($base_url)) { if (isset($base_url)) {
// Parse fixed base URL from settings.php. // Parse fixed base URL from settings.php.
$parts = parse_url($base_url); $parts = parse_url($base_url);
$base_path = isset($parts['path']) ? $parts['path'] . '/' : '/'; if (!isset($parts['path'])) {
$parts['path'] = '';
}
$base_path = $parts['path'] . '/';
// Build $base_root (everything until first slash after "scheme://"). // Build $base_root (everything until first slash after "scheme://").
$base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path'])); $base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path']));
} }
......
Supports Markdown
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