diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-25 22:39:42 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-25 22:39:42 +0100 |
| commit | 5bdfc6167ba13fc525470f89602889ff5bc3ed79 (patch) | |
| tree | 1e6a6e33e90c503dcab86818775c74caeec34157 /phpBB/phpbb/install/module | |
| parent | 49d42e288120d1bbce3a592fb659ddb69e65eed4 (diff) | |
| download | forums-5bdfc6167ba13fc525470f89602889ff5bc3ed79.tar forums-5bdfc6167ba13fc525470f89602889ff5bc3ed79.tar.gz forums-5bdfc6167ba13fc525470f89602889ff5bc3ed79.tar.bz2 forums-5bdfc6167ba13fc525470f89602889ff5bc3ed79.tar.xz forums-5bdfc6167ba13fc525470f89602889ff5bc3ed79.zip | |
[ticket/14499] Add command to update the board from CLI
PHPBB3-14499
Diffstat (limited to 'phpBB/phpbb/install/module')
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/requirements/task/check_update.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php index c139b70fa4..3b24e8ba40 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php @@ -53,6 +53,14 @@ class obtain_update_settings extends task_base if ($this->iohandler->get_input('submit_update', false)) { $update_files = $this->iohandler->get_input('update_type', 'all') === 'all'; + + if ($this->installer_config->get('disable_filesystem_update', false) && $update_files) + { + $this->iohandler->add_error_message('UPDATE_FILES_NOT_FOUND'); + + throw new user_interaction_required_exception(); + } + $this->installer_config->set('do_update_files', $update_files); } else diff --git a/phpBB/phpbb/install/module/requirements/task/check_update.php b/phpBB/phpbb/install/module/requirements/task/check_update.php index 4e9124ff47..cd66ffc8f9 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_update.php +++ b/phpBB/phpbb/install/module/requirements/task/check_update.php @@ -122,7 +122,7 @@ class check_update extends task_base // Check for a valid update directory if (!$this->filesystem->exists($update_files) || !$this->filesystem->is_readable($update_files)) { - $this->iohandler->add_error_message('UPDATE_FILES_NOT_FOUND'); + $this->iohandler->add_warning_message('UPDATE_FILES_NOT_FOUND'); $this->set_test_passed(false); // If there are no update files, we can't check the version etc |