Index: admin/environment.xml
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/environment.xml,v
retrieving revision 1.31
diff -u -r1.31 environment.xml
--- admin/environment.xml	11 May 2008 18:57:53 -0000	1.31
+++ admin/environment.xml	16 May 2008 19:59:00 -0000
@@ -214,6 +214,7 @@
       <VENDOR name="odbc_mssql" version="9.0" />
       <VENDOR name="mssql_n" version="9.0" />
       <VENDOR name="oracle" version="9.0" />
+      <VENDOR name="sqlite" version="2.0" />
     </DATABASE>
     <PHP version="5.2.0" level="required">
     </PHP>
Index: install.php
===================================================================
RCS file: /cvsroot/moodle/moodle/install.php,v
retrieving revision 1.103
diff -u -r1.103 install.php
--- install.php	16 Jun 2008 16:20:45 -0000	1.103
+++ install.php	22 Jun 2008 14:46:02 -0000
@@ -168,7 +168,8 @@
     'mssql_n_adodb',
     'mssql_adodb',
     'odbc_mssql_adodb',
-    'oci8po_adodb'
+    'oci8po_adodb',
+    'sqlite3_pdo',
 );
 $databases = array ();
 foreach($supported as $driver) {
@@ -318,9 +319,8 @@
 
     if (empty($errormsg)) {
         error_reporting(0);  // Hide errors
-
         if (! $dbconnected = $DB->connect($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'], false, $INSTALL['prefix'])) {
-            if (!$DB->create_database($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'])) {
+            if (!$DB->create_database($INSTALL['dbhost'], $INSTALL['dbuser'], $INSTALL['dbpass'], $INSTALL['dbname'])) {
                  $errormsg = get_string('dbcreationerror', 'install');
                  $nextstage = DATABASE;
             } else {
@@ -472,6 +472,13 @@
             } else {
                 $str .= '$CFG->'.$key.' = false;'."\r\n";
             }
+        } else if (is_array($value)) {
+            if (empty($value)) {
+                $value = 'array()';
+            } else {
+                $value = 'unserialize(\'' . addsingleslashes(serialize($value)) . '\')';
+            }
+            $str .= '$CFG->'.$key.' = '. $value . ";\r\n";
         } else {
             $str .= '$CFG->'.$key.' = \''.addsingleslashes($value)."';\r\n";
         }
Index: install/lang/en_utf8/installer.php
===================================================================
RCS file: /cvsroot/moodle/moodle/install/lang/en_utf8/installer.php,v
retrieving revision 1.33
diff -u -r1.33 installer.php
--- install/lang/en_utf8/installer.php	20 May 2008 01:18:41 -0000	1.33
+++ install/lang/en_utf8/installer.php	22 Jun 2008 14:14:50 -0000
@@ -154,6 +154,13 @@
        <b>User:</b> your database username<br />
        <b>Password:</b> your database password<br />
        <b>Tables Prefix:</b> prefix to use for all table names (mandatory)';
+$string['databasesettingssub_sqlite3_pdo'] = '<b>Type:</b> SQLite 3 (PDO)<br />
+       <b>Host:</b> path to the directory where the database file will be saved (use a full path); use localhost or leave blank to use Moodle data directory<br />
+       <b>Name:</b> database name, eg moodle (optional)<br />
+       <b>User:</b> your database username (optional)<br />
+       <b>Password:</b> your database password (optional)<br />
+       <b>Tables Prefix:</b> optional prefix to use for all table names<br />
+	   The name of the database file will be determined by the username, database name and password you entered above.';
 $string['databasesettingswillbecreated'] = '<b>Note:</b> The installer will try to create the database automatically if not exists.';
 $string['databasetype']='Database type :';
 $string['databaseuser']='Database user :';
@@ -390,6 +397,7 @@
 $string['siteshortname'] = 'Site short name :';
 $string['sitesummary'] ='Site summary :';
 $string['skipdbencodingtest'] = 'Skip DB Encoding Test';
+$string['sqlite3_pdo'] = 'SQLite 3 (PDO)';
 $string['status'] = 'Status';
 $string['tableprefix']='Table prefix :';
 $string['thischarset'] = 'UTF-8';
Index: lang/en_utf8/install.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/install.php,v
retrieving revision 1.23
diff -u -r1.23 install.php
--- lang/en_utf8/install.php	8 May 2008 02:21:53 -0000	1.23
+++ lang/en_utf8/install.php	22 Jun 2008 14:36:27 -0000
@@ -325,6 +325,8 @@
 $string['siteshortname'] = 'Site short name :';
 $string['sitesummary'] ='Site summary :';
 $string['skipdbencodingtest'] = 'Skip DB Encoding Test';
+$string['sqlite3_pdo'] = 'SQLite 3 (PDO)';
+$string['sqliteextensionisnotpresentinphp'] = 'PHP has not been properly configured with the SQLite extension.  Please check your php.ini file or recompile PHP.';
 $string['tableprefix']='Table prefix :';
 $string['upgradingactivitymodule']= 'Upgrading Activity Module';
 $string['upgradingbackupdb'] = 'Upgrading Backup Database';