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

[ticket/15353] Make sure users can continue update after merging file diff

Browse Source 
PHPBB3-15353
This commit is contained in:
Marc Alexander
2017-09-10 12:50:06 +02:00
parent 954af4f180
commit f8f985c099
4 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)