Merge pull request #5713 from sanser/4.0

FIX: fileconf.php redundant else blocks
This commit is contained in:
Juanjo Menent 2016-09-08 18:11:44 +02:00 committed by GitHub
commit bdb55895fa

View File

@ -561,22 +561,12 @@ function jscheckparam()
ok=false;
alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseSoRootRequired")); ?>');
}
else if (document.forminstall.db_create_database.checked == true && (document.forminstall.db_user_root.value == ''))
{
ok=false;
alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseSoRootRequired")); ?>');
}
// If create user asked
else if (document.forminstall.db_create_user.checked == true && (document.forminstall.db_user_root.value == ''))
{
ok=false;
alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseUserSoRootRequired")); ?>');
}
else if (document.forminstall.db_create_user.checked == true && (document.forminstall.db_user_root.value == ''))
{
ok=false;
alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseUserSoRootRequired")); ?>');
}
return ok;
}