aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-03-21 23:41:19 +0000
committerpatdenice <patdenice@piwigo.org>2010-03-21 23:41:19 +0000
commitfdb92b15fa6ce135e298e215d97af11640156692 (patch)
treed0fe8da13c9d2706596a1402f4c13d187f433fd1 /admin/include
parentf5af5ab4c18872868bd1410eca05a67e334a7975 (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 'admin/include')
-rw-r--r--admin/include/functions_install.inc.php23
1 files changed, 14 insertions, 9 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
index 48699cd29..7d8ae41e7 100644
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -104,16 +104,21 @@ function available_engines()
}
}
- if ($engines['sqlite']['available'] && $engines['pdo-sqlite']['available'])
+ if ($engines['sqlite']['available'] and !$engines['pdo-sqlite']['available'])
{
- if ($GLOBALS['conf']['db_sqlite_default']=='native')
- {
- unset($engines['pdo-sqlite']);
- }
- else
- {
- unset($engines['sqlite']);
- }
+ unset($engines['pdo-sqlite']);
+ }
+ elseif ($engines['pdo-sqlite']['available'] and !$engines['sqlite']['available'])
+ {
+ unset($engines['sqlite']);
+ }
+ elseif (DEFAULT_DB_SQLITE=='native')
+ {
+ unset($engines['pdo-sqlite']);
+ }
+ else
+ {
+ unset($engines['sqlite']);
}
return $engines;