Changeset 5239 for trunk/admin/include/functions_install.inc.php

Timestamp:

Mar 22, 2010, 12:41:19 AM (14 years ago)

Author:

patdenice

Message:

feature 1255: Move $confdb_sqlite_default and $confdbengine_select_default in install.php (as constants).
PDO::SQLite is now displayed as SQLite in install page.
Always display unique SQLite engine.

File:

• trunk/admin/include/functions_install.inc.php (modified) (1 diff)

trunk/admin/include/functions_install.inc.php

@@ -105 +105 @@
   }
 
-  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']);
   }