forks/baikal
1
0
Fork 0
Code Releases Activity

Only disabling admin after we are really done with installation.

Browse source 
Should fix #513
This commit is contained in:
Evert Pot 2016-03-23 22:44:10 -04:00
parent c30dd5b975
commit 33ed2e2d31
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
View file

@ -46,8 +46,7 @@ class Database extends \Flake\Core\Controller {
$this->oForm->execute();
if ($this->oForm->persisted()) {
# nothing here
touch(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED');
}
}
}

6
Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
View file

@ -71,9 +71,11 @@ if (!defined("BAIKAL_CONFIGURED_VERSION")) {
if (BAIKAL_CONFIGURED_VERSION !== BAIKAL_VERSION) {
# we have to upgrade Baïkal
$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\VersionUpgrade());
} elseif (!file_exists(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED')) {
$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Database());
} else {
die('Baïkal is already installed. Please log in to the admin interface');
//$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Database());
echo "Installation was already completed. Please head to the admin interface to modify any settings.\n";
die();
}
}