diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-29 21:45:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-29 21:45:11 +0100 |
| commit | b80cb8e796a107a49b77b0efe9d43ee7ef550655 (patch) | |
| tree | 797c83cf7878de21e7e02ef5f9139cce8d17c296 /phpBB/phpbb/install/module | |
| parent | f0a33dca7255e2fb643d1a1e5fa4cfe42934fe2b (diff) | |
| parent | 52dffef03cb97a54041b1fba638eafb3ed0a5ce0 (diff) | |
| download | forums-b80cb8e796a107a49b77b0efe9d43ee7ef550655.tar forums-b80cb8e796a107a49b77b0efe9d43ee7ef550655.tar.gz forums-b80cb8e796a107a49b77b0efe9d43ee7ef550655.tar.bz2 forums-b80cb8e796a107a49b77b0efe9d43ee7ef550655.tar.xz forums-b80cb8e796a107a49b77b0efe9d43ee7ef550655.zip | |
Merge pull request #4194 from Nicofuma/ticket/14499
[ticket/14499] Add command to update the board from CLI
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 |