diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-04 04:55:54 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-04 04:55:54 +0000 |
| commit | 5f3caeda01c6267d583b9243dc10cfbcf4af64ae (patch) | |
| tree | cc5e272233d29553e39ccf8a3f9c5da3452f949b /lib | |
| parent | 513963dea099d78a616acd396eaae9525142df20 (diff) | |
| download | ampache-5f3caeda01c6267d583b9243dc10cfbcf4af64ae.tar.gz ampache-5f3caeda01c6267d583b9243dc10cfbcf4af64ae.tar.bz2 ampache-5f3caeda01c6267d583b9243dc10cfbcf4af64ae.zip | |
fixed an install bug, and bumped version for release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/init.php | 2 | ||||
| -rw-r--r-- | lib/install.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/init.php b/lib/init.php index 7e4c07c4..e644924f 100644 --- a/lib/init.php +++ b/lib/init.php @@ -71,7 +71,7 @@ if (!count($results)) { } /** This is the version.... fluf nothing more... **/ -$results['version'] = '3.4-Alpha2 Build (003)'; +$results['version'] = '3.4-Alpha2'; $results['int_config_version'] = '5'; $results['raw_web_path'] = $results['web_path']; diff --git a/lib/install.php b/lib/install.php index 779f9564..a5f7032b 100644 --- a/lib/install.php +++ b/lib/install.php @@ -74,12 +74,12 @@ function install_check_status($configfile) { Check and see if they've got _any_ account if they don't then they're cool */ - $results = parse_ini_file($GLOBALS['configfile']); + $results = parse_ini_file($configfile); $dbh = check_database($results['database_hostname'],$results['database_username'],$results['database_password']); if (is_resource($dbh)) { - - $sql = "SELECT * FROM user"; + @mysql_select_db($results['database_name'],$dbh); + $sql = "SELECT * FROM `user`"; $db_results = @mysql_query($sql, $dbh); if (!@mysql_num_rows($db_results)) { return true; |