From 5d08a6fe44ecb904789c55072ff20b20e25104da Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Wed, 1 Jun 2011 12:50:20 -0700
Subject: [PATCH] #17826: SiteSettings lose encryption keys when edited

Work Items: #17826

--HG--
branch : 1.x
---
 src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs    | 2 +-
 .../Orchard.MultiTenancy/Controllers/AdminController.cs  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
index b727082a5..0bf6a3e89 100644
--- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
+++ b/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));
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
index e59f8c05c..8bd2cf769 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
+++ b/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");