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 /include | |
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 'include')
-rw-r--r-- | include/config_default.inc.php | 10 | ||||
-rw-r--r-- | include/dblayer/dblayers.inc.php | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php index b6ee06e4d..0850723f6 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -528,16 +528,6 @@ $conf['user_fields'] = array( 'email' => 'mail_address' ); -// database engine default choice between sqlite (native or via pdo) -// if the twice are available. -// $conf['db_sqlite_default'] = 'pdo'; -$conf['db_sqlite_default'] = 'native'; - -// default database engine proposed if severals are available -// choices : sqlite, mysql, pgsql, pdo-sqlite -// see include/dblayer/dblayers.inc.php -$conf['dbengine_select_default'] = 'mysql'; - // pass_convert : function to crypt or hash the clear user password to store // it in the database $conf['pass_convert'] = create_function('$s', 'return md5($s);'); diff --git a/include/dblayer/dblayers.inc.php b/include/dblayer/dblayers.inc.php index ec650a384..cfa543998 100644 --- a/include/dblayer/dblayers.inc.php +++ b/include/dblayer/dblayers.inc.php @@ -34,7 +34,7 @@ $dblayers['sqlite'] = array('engine' => 'SQLite', 'function_available' => 'sqlite_open' ); -$dblayers['pdo-sqlite'] = array('engine' => 'PDO::SQLite', +$dblayers['pdo-sqlite'] = array('engine' => 'SQLite', 'class_available' => 'PDO' ); |