diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-09-10 12:50:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-09-10 12:52:12 +0200 |
| commit | f8f985c099225700a888a91c34f0481910e08378 (patch) | |
| tree | 14fac4d7f747b99a27ed2def90bb04ba1e831d0b /phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | |
| parent | 954af4f18009740bdf3f15b6a2518162e0638c05 (diff) | |
| download | forums-f8f985c099225700a888a91c34f0481910e08378.tar forums-f8f985c099225700a888a91c34f0481910e08378.tar.gz forums-f8f985c099225700a888a91c34f0481910e08378.tar.bz2 forums-f8f985c099225700a888a91c34f0481910e08378.tar.xz forums-f8f985c099225700a888a91c34f0481910e08378.zip | |
[ticket/15353] Make sure users can continue update after merging file diff
PHPBB3-15353
Diffstat (limited to 'phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php')
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | 6 |
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 bce0149890..dd584eff30 100644 --- a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php @@ -187,6 +187,7 @@ class ajax_iohandler extends iohandler_base $tpl_ary['KEY'] = $input_name; $tpl_ary['S_EXPLAIN'] = false; $tpl_ary['DISABLED'] = isset($input_options['disabled']) ? $input_options['disabled'] : false; + $tpl_ary['IS_SECONDARY'] = isset($input_options['is_secondary']) ? $input_options['is_secondary'] : false; if (isset($input_options['default'])) { @@ -218,6 +219,11 @@ class ajax_iohandler extends iohandler_base $this->template->assign_block_vars($block_name, $tpl_ary); } + if (isset($form['database_update_submit']) && !$form['database_update_submit']['disabled']) + { + $this->template->assign_var('FORM_TITLE', $this->language->lang('UPDATE_CONTINUE_UPDATE_PROCESS')); + } + $this->template->assign_var('S_NOT_ONLY_BUTTON_FORM', $not_button_form); if (!$not_button_form) |