summaryrefslogtreecommitdiff
path: root/installer/web.php
diff options
context:
space:
mode:
Diffstat (limited to 'installer/web.php')
-rw-r--r--installer/web.php8
1 files changed, 6 insertions, 2 deletions
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 <code>var</code> directory");
} else if (!installer::unpack_sql($config)) {