From 7778d4c05075e67f096d3d5365e5ae35e1b0a737 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 6 Jan 2010 10:11:03 -0800 Subject: Provide an error message when the sql in installer::empty_db fails. Also change the show tables not to specify a database as it will use the database in the active connection. Fixes ticket #963. --- installer/web.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'installer/web.php') diff --git a/installer/web.php b/installer/web.php index 65233b31..90143afb 100644 --- a/installer/web.php +++ b/installer/web.php @@ -46,8 +46,12 @@ if (installer::already_installed()) { $content = render("invalid_db_version.html.php"); } else if (!installer::select_db($config)) { $content = render("missing_db.html.php"); - } else if (!installer::db_empty($config)) { - $content = render("db_not_empty.html.php"); + } else if (is_string($count = installer::db_empty($config)) || !$count) { + if (is_string($count)) { + $content = oops($count); + } else { + $content = render("db_not_empty.html.php"); + } } else if (!installer::unpack_var()) { $content = oops("Unable to create files inside the var directory"); } else if (!installer::unpack_sql($config)) { -- cgit v1.2.3