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
This commit is contained in:
parent
f5af5ab4c1
commit
fdb92b15fa
4 changed files with 25 additions and 21 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue