diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-02-27 19:26:21 +0000 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-02-27 19:26:21 +0000 |
commit | 0b9fe18a6bf4036a05db7f9479d7b55d3fe5c782 (patch) | |
tree | 2d9905f25634fdc9fecec88362d1911e393a4b4b /installer/web.php | |
parent | dc4f784558db725eb555ce9668231b89aabb8954 (diff) |
Both the command line and web installer installer now supports
creating tables with a table prefix.
There are still some queries that haven't been converted, so don't
start using prefixes yet. However, if you do, you can login and
modify the user profile.
Diffstat (limited to 'installer/web.php')
-rw-r--r-- | installer/web.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/installer/web.php b/installer/web.php index 47d60a34..27124cd9 100644 --- a/installer/web.php +++ b/installer/web.php @@ -36,7 +36,7 @@ if (installer::already_installed()) { "user" => $_POST["dbuser"], "password" => $_POST["dbpass"], "dbname" => $_POST["dbname"], - "prefix" => "", + "prefix" => $_POST["prefix"], "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql"); if (!installer::connect($config)) { @@ -47,7 +47,7 @@ if (installer::already_installed()) { $content = render("db_not_empty.html.php"); } else if (!installer::unpack_var()) { $content = oops("Unable to create files inside the <code>var</code> directory"); - } else if (!installer::unpack_sql()) { + } else if (!installer::unpack_sql($config)) { $content = oops("Failed to create tables in your database:" . mysql_error()); } else if (!installer::create_database_config($config)) { $content = oops("Couldn't create var/database.php"); @@ -56,7 +56,7 @@ if (installer::already_installed()) { list ($user, $password) = installer::create_admin($config); $content = render("success.html.php", array("user" => $user, "password" => $password)); - installer::create_private_key(); + installer::create_private_key($config); } catch (Exception $e) { $content = oops($e->getMessage()); } |