Skip to content

Commit

Permalink
Install: fix layout of check and options sections
Browse files Browse the repository at this point in the history
Incorrect closing of tables and divs within the various conditional
blocks caused the title of the 'Installation Options' section to be
displayed as a "sub-table" under the 'Checking Installation' section,
followed by the actual install checks and finally the list of
installation options.

This commit moves the closing tags as appropriate, so that
- checks are listed as a table under 'Checking Installation' section
- 'Installation Options' is displayed as an independent section below
  the checks

Fixes #22850
  • Loading branch information
dregad committed May 15, 2017
1 parent cf89c0f commit 624f905
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions admin/install.php
Expand Up @@ -493,9 +493,18 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
);
?>
</tr>
</table>

<?php
}?>
if( false == $g_failed ) {
$t_install_state++;
} else {
$t_install_state--; # a check failed, redisplay the questions
}
} # end if db open
} # end 2 == $t_install_state
?>

</table>
</table>
</div>
</div>
Expand All @@ -504,13 +513,6 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
</div>

<?php
if( false == $g_failed ) {
$t_install_state++;
} else {
$t_install_state--; # a check failed, redisplay the questions
}
} # end 2 == $t_install_state

# system checks have passed, get the database information
if( 1 == $t_install_state ) {
?>
Expand Down

0 comments on commit 624f905

Please sign in to comment.