diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-30 14:57:04 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-30 14:57:04 -0400 |
| commit | e9ac70bfa76bf17e60936cf59c4e0ef13efbda82 (patch) | |
| tree | 27f6e8ccf7fa1883d8511e5e4dc02e6749094c43 /install.php | |
| parent | 2b834d04d9d57db0709b829260cae87aae9136f3 (diff) | |
| parent | 63e8f15448ac2cfb5217ddd96bb95821b6f106c5 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/install.php b/install.php index 901e502f1..c222afa7b 100644 --- a/install.php +++ b/install.php @@ -77,7 +77,7 @@ function checkPrereqs() if (!is_writable($fileFullPath)) { ?><p class="error">Cannot write <?php echo $fileSubdir; ?> directory: <code><?php echo $fileFullPath; ?></code></p> <p>On your server, try this command: <code>chmod a+w <?php echo $fileFullPath; ?></code></p> - <? + <?php $pass = false; } } @@ -219,9 +219,9 @@ function handlePost() } switch($dbtype) { - case 'mysql': mysql_db_installer($host, $database, $username, $password, $sitename); + case 'mysql': mysql_db_installer($host, $database, $username, $password, $sitename, $fancy); break; - case 'pgsql': pgsql_db_installer($host, $database, $username, $password, $sitename); + case 'pgsql': pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy); break; default: } @@ -232,7 +232,7 @@ function handlePost() <?php } -function pgsql_db_installer($host, $database, $username, $password, $sitename) { +function pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy) { $connstring = "dbname=$database host=$host user=$username"; //No password would mean trust authentication used. @@ -298,7 +298,7 @@ function pgsql_db_installer($host, $database, $username, $password, $sitename) { } -function mysql_db_installer($host, $database, $username, $password, $sitename) { +function mysql_db_installer($host, $database, $username, $password, $sitename, $fancy) { updateStatus("Starting installation..."); updateStatus("Checking database..."); |