mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/15293] Prevent continuing to database update on incomplete file update
This commit is contained in:
Tristan Darricau
2017-07-26 13:09:30 +02:00
parent 51d42b2ced aa5a0f62c4
commit ca260d41e5
6 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
View File

@@ -186,6 +186,7 @@ class ajax_iohandler extends iohandler_base
$tpl_ary['TITLE'] = $this->language->lang($input_options['label']);
$tpl_ary['KEY'] = $input_name;
$tpl_ary['S_EXPLAIN'] = false;
$tpl_ary['DISABLED'] = isset($input_options['disabled']) ? $input_options['disabled'] : false;
if (isset($input_options['default']))
{
@@ -219,6 +220,11 @@ class ajax_iohandler extends iohandler_base
$this->template->assign_var('S_NOT_ONLY_BUTTON_FORM', $not_button_form);
if (!$not_button_form)
{
$this->template->destroy_block_vars('options');
}
$this->template->set_filenames(array(
'form_install' => 'installer_form.html',
));