diff --git a/install.php b/install.php index 352d5a143c..f9d69262e2 100644 --- a/install.php +++ b/install.php @@ -165,7 +165,9 @@ class WebInstaller extends Installer } else { $checked = ''; } - $dbRadios .= " $info[name]
\n"; + $dbRadios .= sprintf('%3$s
', + htmlspecialchars($type), $checked, + htmlspecialchars($info['name'])); } } @@ -212,7 +214,7 @@ class WebInstaller extends Installer
  • - $dbRadios + {$dbRadios}

    Database type

  • diff --git a/lib/installer.php b/lib/installer.php index b649dc3e2c..5e483df82c 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -53,15 +53,15 @@ abstract class Installer public static $dbModules = array( 'mysql' => array( - 'name' => 'MySQL', + 'name' => 'MariaDB (or MySQL 5.5+)', 'check_module' => 'mysqli', 'scheme' => 'mysqli', // DSN prefix for PEAR::DB ), - 'pgsql' => array( +/* 'pgsql' => array( 'name' => 'PostgreSQL', 'check_module' => 'pgsql', 'scheme' => 'pgsql', // DSN prefix for PEAR::DB - ), + ),*/ ); /**