diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-05-13 19:41:56 -0400 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-05-13 21:11:38 -0400 |
| commit | f661e4f6cf1e159888e16ddbb169c7126899f203 (patch) | |
| tree | e07587af29ba390fcb5967107ff3adcca00c431b | |
| parent | a2fa8d3019aba8a7e5eaee90ddf288ffc76bd663 (diff) | |
| download | ampache-f661e4f6cf1e159888e16ddbb169c7126899f203.tar.gz ampache-f661e4f6cf1e159888e16ddbb169c7126899f203.tar.bz2 ampache-f661e4f6cf1e159888e16ddbb169c7126899f203.zip | |
Add a working check for database existence
Fixes GH #21
| -rwxr-xr-x | docs/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/install.lib.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 30bdd876..c6838359 100755 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,8 @@ CHANGELOG 3.6-FUTURE ---------- +- Fixed regression preventing the use of an existing database during + installation (reported by cjsmo) - Fixed operating on all catalogs via the web interface (reported by orbisvicis) - Added support for nonstandard database ports diff --git a/lib/install.lib.php b/lib/install.lib.php index eea48e26..a889d65d 100644 --- a/lib/install.lib.php +++ b/lib/install.lib.php @@ -125,8 +125,7 @@ function install_insert_db($db_user = null, $db_pass = null, $overwrite = false) return false; } - // FIXME - $db_exists = false; + $db_exists = Dba::read('SHOW TABLES'); if ($db_exists && $_POST['existing_db']) { // Rien a faire, we've got the db just blow through |