Write config file correctly

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@584 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 7 insertions, 3 deletions

diff --git a/index.php b/index.php
index 8febda3..52e68f5 100644
--- a/index.php
+++ b/index.php
@@ -284,7 +284,7 @@ function step2() {
     $handle = fopen('wp-inst/wp-config.php', 'w');
 
     foreach ($configFile as $line_num => $line) {
-	switch (substr($line,0,16)) {
+	switch (trim( substr($line,0,16) )) {
 	    case "define('DB_NAME'":
 		fwrite($handle, str_replace("wordpress", $dbname, $line));
 	    break;
@@ -303,9 +303,13 @@ function step2() {
 	    case '$table_prefix  =':
 	    fwrite($handle, str_replace('wp_', $prefix, $line));
 	    break;
+	    case '$base = \'BASE\';':
+	    fwrite($handle, str_replace('BASE', $base, $line));
+	    break;
+	    default:
+	    fwrite($handle, $line);
+	    break;
 	}
-	$line = str_replace( "BASE", $base, $line );
-	fwrite($handle, $line);
     }
     fclose($handle);
     chmod('wp-inst/wp-config.php', 0666);