diff options
| author |   Tristan Darricau <github@nicofuma.fr> | 2017-07-26 13:09:30 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-07-26 13:09:30 +0200 |
| commit | ca260d41e5094f3e66529dcac8c266a10acc0cab (patch) | |
| tree | ed97e553e0913fcc19fb045f113a579262b4e697 /phpBB/adm | |
| parent | Merge pull request #4859 from rubencm/ticket/15253 (diff) | |
| parent | Merge pull request #4879 from marc1706/ticket/15293 (diff) | |
| download | phpbb-ca260d41e5094f3e66529dcac8c266a10acc0cab.tar.gz phpbb-ca260d41e5094f3e66529dcac8c266a10acc0cab.tar.bz2 phpbb-ca260d41e5094f3e66529dcac8c266a10acc0cab.zip | |
Merge branch '3.2.x'
* 3.2.x:
[ticket/15293] Prevent continuing to database update on incomplete file update
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_board.html | 7 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_form.html | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 64592a5de2..04dee98276 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -18,10 +18,11 @@ <!-- BEGIN options --> <!-- IF options.S_LEGEND --> <!-- IF not options.S_FIRST_ROW --> - </fieldset> - <!-- ENDIF --> + </fieldset> + <fieldset> - <legend>{options.LEGEND}</legend> + <!-- ENDIF --> + <legend>{options.LEGEND}</legend> <!-- ELSE --> <dl> diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html index cc5b041fa1..a38f33c7c2 100644 --- a/phpBB/adm/style/installer_form.html +++ b/phpBB/adm/style/installer_form.html @@ -49,7 +49,7 @@ <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> <!-- BEGIN submit_buttons --> - <input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" /> + <input class="button1<!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> /> <!-- END submit_buttons --> </fieldset> <!-- ENDIF --> |