X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions_setup.inc;h=8dac4a887251575c429fca4f54059b077f0b7125;hb=d95bc63eea9befa2ab237f3af670edbec31bed03;hp=8c19f8fa25c663d929fc843258029e0d708fd254;hpb=94e9f5b56046c81fc42c07714cc48f92fe1996fd;p=gosa.git diff --git a/include/functions_setup.inc b/include/functions_setup.inc index 8c19f8fa2..8dac4a887 100644 --- a/include/functions_setup.inc +++ b/include/functions_setup.inc @@ -622,11 +622,14 @@ function parse_contrib_conf() /* Show setup_page 1 */ function show_setup_page1($withoutput = true) { - $faults = false; + $faults = false; + $faults2 = false; $smarty = get_smarty(); $smarty->assign ("content", get_template_path('setup_introduction.tpl')); $smarty->assign ("tests", perform_php_checks($faults)); - $smarty->assign ("detailed_tests", perform_additional_function_checks($faults)); + $smarty->assign ("detailed_tests", perform_additional_function_checks($faults2)); + + $faults = $faults || $faults2; /* This var is true if anything went wrong */ if ($faults){ @@ -653,7 +656,7 @@ function show_setup_page1($withoutput = true) /* Show setup_page 2 */ function show_setup_page2($withoutput = true) { - $faults = array(); + $faults = false; $smarty = get_smarty(); $smarty->assign ("content", get_template_path('setup_step2.tpl')); $smarty->assign ("tests", perform_additional_checks($faults));