Revert unrelated changes

umbraco · Dec 9, 2018 · 838b3af · 838b3af
1 parent 2372acf
commit 838b3af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
@@ -461,7 +461,7 @@ private static bool ServerStartsWithTcp(string server)
         /// </remarks>
         /// <param name="connectionString"></param>
         /// <param name="providerName"></param>
-        internal void SaveConnectionString(string connectionString, string providerName)
+        private void SaveConnectionString(string connectionString, string providerName)
         {
             //Set the connection string for the new datalayer
             var connectionStringSettings = string.IsNullOrEmpty(providerName)
@@ -932,4 +932,4 @@ public void Dispose()
         }
         */
     }
-}
+}
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -1,9 +1,14 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Web;
+using System.Web.Script.Serialization;
+using System.Web.UI;
+using Semver;
 using umbraco.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -108,18 +113,14 @@ internal void InstallStatus(bool isCompleted, string errorMsg)
                     {
                         // check that it's a valid Guid
                         if (installId == Guid.Empty)
-                        {
                             installId = Guid.NewGuid();
-                        }
                     }
                 }
                 installCookie.SetValue(installId.ToString());
 
                 string dbProvider = string.Empty;
                 if (IsBrandNewInstall == false)
-                {
                     dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
-                }
 
                 org.umbraco.update.CheckForUpgrade check = new org.umbraco.update.CheckForUpgrade();
                 check.Install(installId,
@@ -148,16 +149,6 @@ private bool IsBrandNewInstall
             get
             {
                 var databaseSettings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
-
-                if (_umbContext.Application.DatabaseContext.IsConnectionStringConfigured(databaseSettings)
-                    && !_umbContext.Application.DatabaseContext.SqlSyntax.GetTablesInSchema(_umbContext.Application.DatabaseContext.Database).Any())
-                {
-                    GlobalSettings.ConfigurationStatus = string.Empty;
-                    _umbContext.Application.DatabaseContext.SaveConnectionString(string.Empty, string.Empty);
-
-                    return true;
-                }
-
                 if (GlobalSettings.ConfigurationStatus.IsNullOrWhiteSpace()
                     && _umbContext.Application.DatabaseContext.IsConnectionStringConfigured(databaseSettings) == false)
                 {
@@ -202,9 +193,7 @@ private bool IsBrandNewInstall
         internal IEnumerable<Package> GetStarterKits()
         {
             if (_httpClient == null)
-            {
                 _httpClient = new HttpClient();
-            }
 
             var packages = new List<Package>();
             try