Index: branches/RC/core/install/step_templates/upgrade_modules.tpl
===================================================================
diff -u -r8929 -r9988
--- branches/RC/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 8929)
+++ branches/RC/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 9988)
@@ -5,7 +5,7 @@
 	<td class="text" colspan="2" valign="middle">
 		<table cellpadding="0" cellspacing="0">
 			<tr>
-				<td><input type="checkbox" name="modules[]" id="module_%1$s" value="%1$s"/></td>
+				<td><input type="checkbox" %3$s name="modules[]" id="module_%1$s" value="%1$s"/></td>
 				<td><label for="module_%1$s">%2$s</label></td>
 			</tr>
 		</table>
@@ -20,7 +20,9 @@
 		if ($this->Application->isDebugMode()) {
 			$module_title .= ' [from: '.$module_params['FromVersion'].']';
 		}
-		echo sprintf($module_tpl, $module_name, $module_title);
+		$selected = $this->GetVar('modules');
+		$checked = in_array($module_name, $selected) ? 'checked="checked"' : '';
+		echo sprintf($module_tpl, $module_name, $module_title, $checked);
 	}
 ?>
 <tr class="table-color1">
Index: branches/RC/core/install.php
===================================================================
diff -u -r9987 -r9988
--- branches/RC/core/install.php	(.../install.php)	(revision 9987)
+++ branches/RC/core/install.php	(.../install.php)	(revision 9988)
@@ -767,7 +767,9 @@
 			}
 
 			$sqls = file_get_contents(FULL_PATH.$filename);
-			$this->RunSQLText($sqls, $replace_from, $replace_to);
+			if (!$this->RunSQLText($sqls, $replace_from, $replace_to)) {
+				$this->Done();
+			}
 		}
 
 		/**
@@ -815,8 +817,6 @@
   				$this->errorMessage = 'Error: ('.$this->Conn->getErrorCode().') '.$this->Conn->getErrorMsg().'<br /><br />Database Query:<pre>'.htmlspecialchars($sql).'</pre>';
   				$this->LastQueryNum = $i+1;
   				return false;
-//  				$this->Done();
-//  				break;
     		}
 			}
 			return true;