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
Loading
Loading
Loading
Loading
+4 −0
Changes for src/Form/UpgradeStatusForm.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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';
    }