From ac89011bfdd840de49384e547885ff05f5e5d811 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Tue, 2 May 2006 08:37:42 +0000
Subject: [PATCH] #60457 by JonBob (slightly modified), bootstrap.inc produces
[Notice] in error_log
---
includes/bootstrap.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 1353daa77ed2..14b0e79078d6 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -156,7 +156,10 @@ function conf_init() {
if (isset($base_url)) {
// Parse fixed base URL from settings.php.
$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://").
$base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path']));
}
--
GitLab