Merge origin/dev-v7 into dev-v8

2016-07-08 16:32:06 +02:00
parent f8b315dad0 5ebcdce557
commit 3c7245f9ba
296 changed files with 13207 additions and 3583 deletions
--- a/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
@@ -61,8 +61,11 @@ namespace Umbraco.Web.Install.InstallSteps
            }
            else
            {
+                var password = string.Format("'{0}'", database.Password);
+                password = password.Replace("&", "&amp;").Replace(">", "&gt;").Replace("<", "&lt;").Replace("\"", "&quot;").Replace("'", "''");
+
                dbContext.ConfigureDatabaseConnection(
-                    database.Server, database.DatabaseName, database.Login, database.Password,
+                    database.Server, database.DatabaseName, database.Login, password,
                    database.DatabaseType.ToString());
            }
        }