Index: trunk/core/install/incs/install.tpl
===================================================================
diff -u -r6685 -r6692
--- trunk/core/install/incs/install.tpl (.../install.tpl) (revision 6685)
+++ trunk/core/install/incs/install.tpl (.../install.tpl) (revision 6692)
@@ -115,6 +115,7 @@
?>
+
Index: trunk/core/install.php
===================================================================
diff -u -r6691 -r6692
--- trunk/core/install.php (.../install.php) (revision 6691)
+++ trunk/core/install.php (.../install.php) (revision 6692)
@@ -144,14 +144,19 @@
*/
function SelectPreset()
{
- $preset = 'fresh_install';
+ $preset = $this->GetVar('preset');
- if (file_exists($this->INIFile) && $this->GetVar('step') === false) {
- // only at installation first step
- $status = $this->CheckDatabase(false);
- if ($status && $this->AlreadyInstalled()) {
- $preset = 'already_installed';
+ if ($preset === false) {
+ if (file_exists($this->INIFile)) {
+ // only at installation first step
+ $status = $this->CheckDatabase(false);
+ if ($status && $this->AlreadyInstalled()) {
+ $preset = 'already_installed';
+ }
}
+ else {
+ $preset = 'fresh_install';
+ }
}
$this->stepsPreset = $preset;