diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-07 16:03:52 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-07 16:03:52 +0100 |
| commit | f258aebc593cfceb90369741ed8ab03581d689c3 (patch) | |
| tree | be59bd699ed045ce31c332f5cdf775914ce1309a /phpBB/phpbb/install/module/obtain_data | |
| parent | 39f5aaa5265937334ab3c97c5bec7dca2ebb79ee (diff) | |
| parent | ad7b3ed17865b4ac91df24812fce4a9192f44fa1 (diff) | |
| download | forums-f258aebc593cfceb90369741ed8ab03581d689c3.tar forums-f258aebc593cfceb90369741ed8ab03581d689c3.tar.gz forums-f258aebc593cfceb90369741ed8ab03581d689c3.tar.bz2 forums-f258aebc593cfceb90369741ed8ab03581d689c3.tar.xz forums-f258aebc593cfceb90369741ed8ab03581d689c3.zip | |
Merge pull request #4161 from CHItA/ticket/14312
[ticket/14312] Enable running database update only
* CHItA/ticket/14312:
[ticket/14312] Allow updating without having the update directory
[ticket/14312] Push migration error messages to the user
Diffstat (limited to 'phpBB/phpbb/install/module/obtain_data')
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php | 37 |
1 files changed, 25 insertions, 12 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 6a98721e77..be6404dcd8 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 @@ -57,22 +57,35 @@ class obtain_update_settings extends task_base } else { + if ($this->installer_config->get('disable_filesystem_update', false)) + { + $options[] = array( + 'value' => 'db_only', + 'label' => 'UPDATE_TYPE_DB_ONLY', + 'selected' => true, + ); + } + else + { + $options = array( + array( + 'value' => 'all', + 'label' => 'UPDATE_TYPE_ALL', + 'selected' => true, + ), + array( + 'value' => 'db_only', + 'label' => 'UPDATE_TYPE_DB_ONLY', + 'selected' => false, + ), + ); + } + $this->iohandler->add_user_form_group('UPDATE_TYPE', array( 'update_type' => array( 'label' => 'UPDATE_TYPE', 'type' => 'radio', - 'options' => array( - array( - 'value' => 'all', - 'label' => 'UPDATE_TYPE_ALL', - 'selected' => true, - ), - array( - 'value' => 'db_only', - 'label' => 'UPDATE_TYPE_DB_ONLY', - 'selected' => false, - ), - ), + 'options' => $options, ), 'submit_update' => array( 'label' => 'SUBMIT', |