badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #103 from green-ponies/master

Browse source 
Fix for installer failing
This commit is contained in:
Shish Moom 2012-01-31 01:53:52 -08:00
commit 62e34c9b7c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
install.php
View file

@ -119,6 +119,7 @@ if(is_readable("config.php")) {
exit;
}
require_once "core/compat.inc.php";
require_once "core/util.inc.php";
require_once "core/database.class.php";
do_install();
@ -160,6 +161,7 @@ function do_install() { // {{{
if(isset($_POST['database_type']) && isset($_POST['database_host']) && isset($_POST['database_user']) && isset($_POST['database_name'])) {
global $database_dsn;
$database_dsn = "{$_POST['database_type']}:user={$_POST['database_user']};password={$_POST['database_password']};host={$_POST['database_host']};dbname={$_POST['database_name']}";
define('DATABASE_DSN', $database_dsn);
install_process();
}
else if(file_exists("auto_install.conf")) {
@ -362,9 +364,10 @@ function build_dirs() { // {{{
} // }}}
function write_config() { // {{{
global $database_dsn;
$file_content = "<"+"?php\n"+
"define('DATABASE_DSN', '$database_dsn');\n"+
"?"+">";
$file_content = '<' . '?php' . "\n" .
"define('DATABASE_DSN', '$database_dsn');\n" .
'?' . '>';
if(is_writable("./") && file_put_contents("config.php", $file_content)) {
assert(file_exists("config.php"));