diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-06 10:11:03 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-06 10:11:03 -0800 |
| commit | 7778d4c05075e67f096d3d5365e5ae35e1b0a737 (patch) | |
| tree | b3121dd92e8e70d41b5a6a4bc81d8d35112f5714 /installer/cli.php | |
| parent | c5d14438959346551765757a506689a7d8b13665 (diff) | |
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.
Diffstat (limited to 'installer/cli.php')
| -rw-r--r-- | installer/cli.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/installer/cli.php b/installer/cli.php index f736ffcb..e88293ff 100644 --- a/installer/cli.php +++ b/installer/cli.php @@ -41,10 +41,14 @@ if (!installer::connect($config)) { } else if (!installer::select_db($config)) { oops("Database {$config['dbname']} doesn't exist and can't be created. " . "Please create the database by hand."); -} else if (!installer::db_empty($config)) { - oops("Database {$config['dbname']} already has Gallery 3 tables in it. \n" . - " Please remove the Gallery 3 tables, change your prefix,\n" . - " or specify an empty database.\n"); +} else if (is_string($count = installer::db_empty($config)) || !$count) { + if (is_string($count)) { + oops($count); + } else { + oops("Database {$config['dbname']} already has Gallery 3 tables in it. \n" . + " Please remove the Gallery 3 tables, change your prefix,\n" . + " or specify an empty database.\n"); + } } else if (!installer::unpack_var()) { oops("Unable to create files inside the 'var' directory"); } else if (!installer::unpack_sql($config)) { |