Permalink
Browse files

fix(installer): no longer redirects in loop during installation

`Elgg\Config::loadSettingsFile` now recognizes when it's in the installer
and no longer redirects if no settings file is found.

Fixes #9486
  • Loading branch information...
mrclay committed Mar 17, 2016
1 parent 1278914 commit 78d31799843c27fd89f659b38fe5a2954f78296b
Showing with 5 additions and 0 deletions.
  1. +5 −0 engine/classes/Elgg/Config.php
@@ -240,6 +240,11 @@ public function loadSettingsFile() {
// No settings means a fresh install
if (!is_file($path)) {
+ if ($this->getVolatile('installer_running')) {
+ $this->settings_loaded = true;
+ return;
+ }
+
header("Location: install.php");
exit;
}

0 comments on commit 78d3179

Please sign in to comment.