diff options
| author | patdenice <patdenice@piwigo.org> | 2010-03-21 23:41:19 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2010-03-21 23:41:19 +0000 |
| commit | fdb92b15fa6ce135e298e215d97af11640156692 (patch) | |
| tree | d0fe8da13c9d2706596a1402f4c13d187f433fd1 /install | |
| parent | f5af5ab4c18872868bd1410eca05a67e334a7975 (diff) | |
feature 1255: Move $conf['db_sqlite_default'] and $conf['dbengine_select_default'] in install.php (as constants).
PDO::SQLite is now displayed as SQLite in install page.
Always display unique SQLite engine.
git-svn-id: http://piwigo.org/svn/trunk@5239 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | install.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/install.php b/install.php index d722288f5..080b262e1 100644 --- a/install.php +++ b/install.php @@ -98,6 +98,15 @@ if( !@get_magic_quotes_gpc() ) define('DEFAULT_PREFIX_TABLE', 'piwigo_'); +// default database engine proposed if severals are available +// choices : sqlite, mysql, pgsql, pdo-sqlite +// see include/dblayer/dblayers.inc.php +define('DEFAULT_DB_ENGINE', 'mysql'); + +// database engine default choice between sqlite (native or via pdo) +// if the twice are available. +define('DEFAULT_DB_SQLITE', 'native'); + if (isset($_POST['install'])) { $prefixeTable = $_POST['prefix']; @@ -115,7 +124,7 @@ $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost'; $dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : ''; $dbpasswd = (!empty($_POST['dbpasswd'])) ? $_POST['dbpasswd'] : ''; $dbname = (!empty($_POST['dbname'])) ? $_POST['dbname'] : ''; -$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : $conf['dbengine_select_default']; +$dblayer = (!empty($_POST['dblayer'])) ? $_POST['dblayer'] : DEFAULT_DB_ENGINE; $admin_name = (!empty($_POST['admin_name'])) ? $_POST['admin_name'] : ''; $admin_pass1 = (!empty($_POST['admin_pass1'])) ? $_POST['admin_pass1'] : ''; |