aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-28 20:49:18 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-02-28 20:49:18 +0100
commit8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771 (patch)
tree902e82f58c7d7ad5c3d539f21e6c84544dacf3a1
parent5bdfc6167ba13fc525470f89602889ff5bc3ed79 (diff)
downloadforums-8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771.tar
forums-8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771.tar.gz
forums-8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771.tar.bz2
forums-8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771.tar.xz
forums-8ec1a60156f66dd4fe0f0f6e2cfbee1c79132771.zip
[ticket/14499] Add missing config settings
PHPBB3-14499
-rw-r--r--phpBB/docs/update-config.sample.yml2
-rw-r--r--phpBB/phpbb/install/console/command/update/update.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/docs/update-config.sample.yml b/phpBB/docs/update-config.sample.yml
index 92749ffb6a..e9a84b32f2 100644
--- a/phpBB/docs/update-config.sample.yml
+++ b/phpBB/docs/update-config.sample.yml
@@ -1,2 +1,2 @@
udater:
- type: db_only
+ type: all
diff --git a/phpBB/phpbb/install/console/command/update/update.php b/phpBB/phpbb/install/console/command/update/update.php
index 8e0d45172c..dfac13d5d7 100644
--- a/phpBB/phpbb/install/console/command/update/update.php
+++ b/phpBB/phpbb/install/console/command/update/update.php
@@ -170,7 +170,10 @@ class update extends \phpbb\console\command\command
$iohandler->set_input('update_type', $config['type']);
$iohandler->set_input('submit_update', 'submit');
- $iohandler->set_input('method', '.tar');
+ $iohandler->set_input('compression_method', '.tar');
+ $iohandler->set_input('method', 'direct_file');
$iohandler->set_input('submit_update_file', 'submit');
+
+ $iohandler->set_input('submit_continue_file_update', 'submit');
}
}