From 3f2ebbda594eec99376e40c6aa67e639e26816e5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 21 Jul 2016 11:24:08 +0200
Subject: [PATCH] U4-8757 DB error installing 7.5.0 beta2 with SQL server -
 first escape characters, THEN wrap the password in single quotes

#U4-8757 Fixed
---
 src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs b/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
index fbd0b5025c..4854919efb 100644
--- a/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
@@ -61,8 +61,8 @@ namespace Umbraco.Web.Install.InstallSteps
             }
             else
             {
-                var password = string.Format("'{0}'", database.Password);
-                password = password.Replace("&", "&amp;").Replace(">", "&gt;").Replace("<", "&lt;").Replace("\"", "&quot;").Replace("'", "''");
+                var password = database.Password.Replace("&", "&amp;").Replace(">", "&gt;").Replace("<", "&lt;").Replace("\"", "&quot;").Replace("'", "''");
+                password = string.Format("'{0}'", password);
 
                 dbContext.ConfigureDatabaseConnection(
                     database.Server, database.DatabaseName, database.Login, password,