mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/15293] Prevent continuing to database update on incomplete file update
This commit is contained in:
Tristan Darricau
2017-07-26 13:09:30 +02:00
parent 51d42b2ced aa5a0f62c4
commit ca260d41e5
6 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/adm/style/acp_board.html
View File

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

2
phpBB/adm/style/installer_form.html
View File

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