Fixes 27474, 27457, 27146.

[TFS Changeset #67806]
2010-06-10 21:07:56 +00:00
parent 64f515f25d
commit daffb5771d
9 changed files with 329 additions and 3 deletions
--- a/umbraco/presentation/install/default.aspx.cs
+++ b/umbraco/presentation/install/default.aspx.cs
@@ -107,13 +107,21 @@ namespace umbraco.presentation.install
                    loadContent();
                    break;
                case "detect":
-					step.Value = "validatePermissions";
+                    // upgrade!
+                    if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim()))
+                        step.Value = "renaming";
+                    else
+                        step.Value = "validatePermissions";
 					loadContent();
 					break;
 				case "upgradeIndex":
 					step.Value = "validatePermissions";
 					loadContent();
 					break;
+                case "renaming" :
+                    step.Value = "validatePermissions";
+                    loadContent();
+                    break;
 				case "validatePermissions":
 					step.Value = "defaultUser";
 					loadContent();