Commit 28f4497f authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

Issue #3228576 by Dave Reid: Fix variable errors when including settings file the second time

parent 5eb37a70
......@@ -1361,6 +1361,10 @@ MARKUP
$app_root = $this->kernel->getAppRoot();
$site_path = $this->kernel->getSitePath();
if (is_readable($app_root . '/' . $site_path . '/settings.php')) {
// Reset the "global" variables expected to exist for settings.
$settings = [];
$config = [];
$databases = [];
require $app_root . '/' . $site_path . '/settings.php';
}
......
Markdown is supported
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