Merge

--HG--
branch : 1.x

src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs

@@ -142,7 +142,7 @@ namespace Orchard.Tests.DataMigration {
             _schemaBuilder
                 .ExecuteSql("insert into TEST_User VALUES (DEFAULT, DEFAULT)");
 
-            // ensure wehave one record woth the default value
+            // ensure we have one record with the default value
             var command = _session.Connection.CreateCommand();
             command.CommandText = "SELECT count(*) FROM TEST_User WHERE Lastname = 'Doe'";
             Assert.That(command.ExecuteScalar(), Is.EqualTo(1));

src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs

@@ -120,15 +120,18 @@ namespace Orchard.MultiTenancy.Controllers {
 
             try {
                 _tenantService.UpdateTenant(
-                    new ShellSettings
-                    {
+                    new ShellSettings {
                         Name = tenant.Name,
                         RequestUrlHost = viewModel.RequestUrlHost,
                         RequestUrlPrefix = viewModel.RequestUrlPrefix,
                         DataProvider = viewModel.DataProvider,
                         DataConnectionString = viewModel.DatabaseConnectionString,
                         DataTablePrefix = viewModel.DatabaseTablePrefix,
-                        State = tenant.State
+                        State = tenant.State,
+                        EncryptionAlgorithm = tenant.EncryptionAlgorithm,
+                        EncryptionKey = tenant.EncryptionKey,
+                        HashAlgorithm = tenant.HashAlgorithm,
+                        HashKey = tenant.HashKey
                     });
 
                 return RedirectToAction("Index");