Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'install-fixes' into 'develop'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/check.php
View File

@ -112,7 +112,7 @@ if (!file_exists(ROOT_DIR . COMPILE_DIR)) {
if (file_exists($conf_filename)) { if (file_exists($conf_filename)) {
$messages[] = new Message('info', __('Check','The config file exists.')); $messages[] = new Message('info', __('Check','The config file exists.'));
} elseif (is_writable($inc_directory)) { } 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 { } 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)); $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));
} }

1
admin/install.php
View File

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