Index: branches/RC/core/install/step_templates/db_config.tpl
===================================================================
diff -u -r8929 -r10832
--- branches/RC/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 8929)
+++ branches/RC/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 10832)
@@ -7,7 +7,7 @@
     		$option_tpl = '<option value="%1$s"%2$s>%3$s</option>'."\n";
 
     		foreach ($options as $option_key => $option_title) {
-    			$selected = $option_key == $this->systemConfig['Database']['DBType'] ? ' selected' : '';
+    			$selected = $option_key == $this->toolkit->getSystemConfig('Database', 'DBType') ? ' selected' : '';
     			echo sprintf($option_tpl, $option_key, $selected, $option_title);
     		}
     	?>
@@ -18,14 +18,14 @@
 <tr class="table-color2">
 	<td class="text"><b>Hostname<span class="error">*</span>:</b></td>
 	<td align="left">
-		<input type="text" name="DBHost" class="text" value="<?php echo $this->systemConfig['Database']['DBHost']; ?>" />
+		<input type="text" name="DBHost" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBHost'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
 	<td class="text"><b>Database Name<span class="error">*</span>:</b></td>
 	<td align="left">
-		<input type="text" name="DBName" class="text" value="<?php echo $this->systemConfig['Database']['DBName']; ?>" />
+		<input type="text" name="DBName" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBName'); ?>" />
 	</td>
 </tr>
 
@@ -37,7 +37,7 @@
 				$option_tpl = '<option value="%1$s"%2$s>%1$s</option>'."\n";
 				$collations = Array ('utf8_general_ci', 'latin1_swedish_ci');
 				foreach ($collations as $collation) {
-					$selected = ($collation == $this->systemConfig['Database']['DBCollation']) ? ' selected="selected"' : '';
+					$selected = ($collation == $this->toolkit->getSystemConfig('Database', 'DBCollation')) ? ' selected="selected"' : '';
 					echo sprintf($option_tpl, $collation, $selected);
 				}
 			?>
@@ -48,20 +48,27 @@
 <tr class="table-color2">
 	<td class="text"><b>Database User Name<span class="error">*</span>:</b></td>
 	<td align="left">
-		<input type="text" name="DBUser" class="text" value="<?php echo $this->systemConfig['Database']['DBUser']; ?>" />
+		<input type="text" name="DBUser" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUser'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
 	<td class="text"><b>Database User Password:</b></td>
 	<td align="left">
-		<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->systemConfig['Database']['DBUserPassword']; ?>" />
+		<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUserPassword'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
 	<td class="text"><b>Table Name Prefix:</b></td>
 	<td align="left">
-		<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->systemConfig['Database']['TablePrefix']; ?>" />
+		<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->toolkit->getSystemConfig('Database', 'TablePrefix'); ?>" />
 	</td>
+</tr>
+
+<tr class="table-color2">
+	<td class="text"><b>Use existing installation:</b></td>
+	<td align="left">
+		<input type="radio" name="UseExistingSetup" id="UseExistingSetup_1" value="1"/> <label for="UseExistingSetup_1">Yes</label> <input type="radio" name="UseExistingSetup" id="UseExistingSetup_0" value="0" checked/> <label for="UseExistingSetup_0">No</label>
+	</td>
 </tr>
\ No newline at end of file