Skip to content
Snippets Groups Projects
Commit 49bd7c91 authored by Thomas Citharel's avatar Thomas Citharel
Browse files

Merge branch 'install-fixes' into 'develop'

Install fixes

See merge request framasoft/framadate!339
parents d29b703e f3136991
No related branches found
No related tags found
No related merge requests found
......@@ -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));
}
......
......@@ -28,6 +28,7 @@ if (is_file(CONF_FILENAME)) {
}
$error = null;
$result['details'] = null;
$installService = new InstallService();
if (!empty($_POST)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment