diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2017-11-15 21:44:53 +0100 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2017-11-15 21:44:53 +0100 |
| commit | 1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777 (patch) | |
| tree | b830298e992483edc0b1274eeef17563b01b8514 /phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php | |
| parent | 44d5bde61604979ea6f89951e78edf352f8a9bb5 (diff) | |
| parent | f57e3778470ad7df2e69b839fd329e53eb524481 (diff) | |
| download | forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.gz forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.bz2 forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.xz forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.zip | |
Merge pull request #4949 from marc1706/ticket/15353
[ticket/15353] Make sure users can continue update after merging file diff
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) |