Merge branch 'install-fixes' into 'develop'

Install fixes

See merge request framasoft/framadate!339
This commit is contained in:
Thomas Citharel 2018-10-09 11:52:03 +02:00
commit 49bd7c9169
2 changed files with 2 additions and 1 deletions

View File

@ -112,7 +112,7 @@ if (!file_exists(ROOT_DIR . COMPILE_DIR)) {
if (file_exists($conf_filename)) {
$messages[] = new Message('info', __('Check','The config file exists.'));
} elseif (is_writable($inc_directory)) {
$messages[] = new Message('info', __('Check','The config file directory (%s) is writable.', $inc_directory));
$messages[] = new Message('info', __f('Check','The config file directory (%s) is writable.', $inc_directory));
} else {
$messages[] = new Message('danger', __f('Check','The config file directory (%s) is not writable and the config file (%s) does not exists.', $inc_directory, $conf_filename));
}

View File

@ -28,6 +28,7 @@ if (is_file(CONF_FILENAME)) {
}
$error = null;
$result['details'] = null;
$installService = new InstallService();
if (!empty($_POST)) {