diff --git a/install.php b/install.php index e10cf07fedd..7a7048454e5 100644 --- a/install.php +++ b/install.php @@ -570,6 +570,7 @@ if ($nextstage == SAVE) { //==========================================================================// ?> +
@@ -591,10 +592,10 @@ if (isset($_GET['help'])) { ?> -|
-
|
@@ -608,40 +609,48 @@ if (isset($_GET['help'])) {
/// from the standard one to show better instructions for each DB
if ($nextstage == DATABASE) {
echo '';
- echo ' ' . get_string('databasesettingssub_mysql', 'install');
- echo ' ' . get_string('databasesettingswillbecreated', 'install') . ' '; + echo '' . get_string('databasesettingssub_mysql', 'install');
+ echo ' ';
- echo '' . get_string('databasesettingswillbecreated', 'install') . ' '; echo '' . get_string('databasesettingssub_mysqli', 'install');
- echo ' ' . get_string('databasesettingswillbecreated', 'install') . ' '; + echo '' . get_string('databasesettingssub_mysqli', 'install');
+ echo ' ';
- echo '' . get_string('databasesettingswillbecreated', 'install') . ' '; echo '' . get_string('databasesettingssub_postgres7', 'install') . ' ';
+ echo '' . get_string('databasesettingssub_postgres7', 'install') . ' ';
- echo '' . get_string('databasesettingssub_mssql', 'install');
+ echo ' ' . get_string('databasesettingssub_mssql', 'install');
/// Link to mssql installation page
- echo ' ';
- echo '';
+ echo " ";
echo ' ' . get_string('databasesettingssub_mssql_n', 'install');
+ echo ' ' . get_string('databasesettingssub_mssql_n', 'install');
/// Link to mssql installation page
- echo ' ';
- echo '';
+ echo " ";
echo ' '. get_string('databasesettingssub_odbc_mssql', 'install');
+ echo ' '. get_string('databasesettingssub_odbc_mssql', 'install');
/// Link to mssql installation page
- echo ' ';
- echo '';
+ echo " ";
echo ' ' . get_string('databasesettingssub_oci8po', 'install');
+ echo ' ' . get_string('databasesettingssub_oci8po', 'install');
/// Link to oracle installation page
- echo ' ';
@@ -659,7 +668,7 @@ if (isset($_GET['help'])) {
$errormsg\n";
+if (!empty($errormsg)) echo "';
+ echo " ";
echo ' $errormsg \n"; if ($nextstage == SAVE) { @@ -667,13 +676,13 @@ if ($nextstage == SAVE) { $options = array(); $options['lang'] = $INSTALL['language']; if ($configsuccess) { - echo "".get_string('configfilewritten', 'install')." \n"; + echo "".get_string('configfilewritten', 'install')." \n"; echo "
|