From c245527cbab3eedfd4d0c3cf22a501568e05061e Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Thu, 3 Jan 2013 23:17:43 +0400
Subject: [PATCH 1/2] merge commit

---
 WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config | 4 ++--
 .../WebsitePanel.WebPortal/App_Data/SiteSettings.config       | 2 +-
 .../WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj      | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3766094f..11cbebba 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,11 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
+    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="1234567890" />
+    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config
index 4fc71ff6..61256233 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/SiteSettings.config
@@ -3,7 +3,7 @@
 	<!-- Display Settings -->
 	<PortalName>WebsitePanel</PortalName>
 	<!-- Enterprise Server -->
-	<EnterpriseServer>http://localhost:9002</EnterpriseServer>
+	<EnterpriseServer>http://localhost:9005</EnterpriseServer>
 	<!-- General Settings -->
 	<CultureCookieName>UserCulture</CultureCookieName>
 	<ThemeCookieName>UserTheme</ThemeCookieName>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index b28564d3..d4f55c36 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -224,7 +224,9 @@
     <Content Include="App_Data\ModulesData.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_Data\SiteSettings.config" />
+    <Content Include="App_Data\SiteSettings.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="App_Data\SupportedThemes.config" />
     <None Include="App_Data\Countries.config" />
     <None Include="App_Data\CountryStates.config" />

From 9e684350ad61f272939aa2861cc6b7891b4e38bc Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Fri, 4 Jan 2013 17:25:19 +0400
Subject: [PATCH 2/2] Fixed: IIS7 settings not persistent due to exception
 raised within helicon configuration

---
 .../WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
index c414927e..ba4737f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
@@ -275,7 +275,12 @@ namespace WebsitePanel.Portal.ProviderControls
 
             // Helicon Ape
 		    bool registerHeliconApeGlobbally = chkHeliconApeGlobalRegistration.Checked;
-            if (registerHeliconApeGlobbally != (bool)ViewState["HeliconApeInitiallyEnabled"])
+
+            bool bHeliconApeInitiallyEnabled = false;
+            if (ViewState["HeliconApeInitiallyEnabled"] != null)
+                bHeliconApeInitiallyEnabled = (bool)ViewState["HeliconApeInitiallyEnabled"];
+
+            if (registerHeliconApeGlobbally != bHeliconApeInitiallyEnabled)
             {
                 if (registerHeliconApeGlobbally)
                 {