aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/helper
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-07-23 21:09:30 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-07-23 21:09:30 +0200
commitd84834db88ea54bc33a323457236943a56399747 (patch)
treeacbd0dfd70478610ccc5f2dba6f87a77303fc97f /phpBB/phpbb/install/helper
parent63d85935f54f748d81ecd9e3bdc0f02ffedd2756 (diff)
downloadforums-d84834db88ea54bc33a323457236943a56399747.tar
forums-d84834db88ea54bc33a323457236943a56399747.tar.gz
forums-d84834db88ea54bc33a323457236943a56399747.tar.bz2
forums-d84834db88ea54bc33a323457236943a56399747.tar.xz
forums-d84834db88ea54bc33a323457236943a56399747.zip
[ticket/15293] Prevent continuing to database update on incomplete file update
PHPBB3-15293
Diffstat (limited to 'phpBB/phpbb/install/helper')
-rw-r--r--phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
index a40d457466..bce0149890 100644
--- a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
+++ b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
@@ -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',
));