From fdb92b15fa6ce135e298e215d97af11640156692 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Sun, 21 Mar 2010 23:41:19 +0000
Subject: 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
---
 admin/include/functions_install.inc.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'admin/include')

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;
-- 
cgit v1.2.3