Merge pull request #3561 from davidjrh/develop

Fix missing parsing of AllowUserUICulture and EnableBrowserLanguage settings from portal templates #3558
dnnsoftware · Feb 18, 2020 · 7c790d8 · 7c790d8
2 parents 6671e11 + f95bb6b
commit 7c790d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/DNN Platform/Library/Entities/Portals/PortalController.cs b/DNN Platform/Library/Entities/Portals/PortalController.cs
@@ -1472,6 +1472,14 @@ private void ParsePortalSettings(XmlNode nodeSettings, int portalId)
             {
                 UpdatePortalSetting(portalId, "AddCompatibleHttpHeader", XmlUtils.GetNodeValue(nodeSettings, "addcompatiblehttpheader", ""));
             }
+            if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "allowuseruiculture", "")))
+            {
+                UpdatePortalSetting(portalId, "AllowUserUICulture", XmlUtils.GetNodeValue(nodeSettings, "allowuseruiculture", ""));
+            }
+            if (!String.IsNullOrEmpty(XmlUtils.GetNodeValue(nodeSettings, "enablebrowserlanguage", "")))
+            {
+                UpdatePortalSetting(portalId, "EnableBrowserLanguage", XmlUtils.GetNodeValue(nodeSettings, "enablebrowserlanguage", ""));
+            }
         }
 
         private void ParseRoleGroups(XPathNavigator nav, int portalID, int administratorId)

diff --git a/DNN Platform/Website/DesktopModules/Admin/Portals/portal.template.xsd b/DNN Platform/Website/DesktopModules/Admin/Portals/portal.template.xsd
@@ -42,6 +42,8 @@
               <xs:element name="pageheadtext" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="injectmodulehyperlink" type="xs:string" minOccurs="0" maxOccurs="1" />
               <xs:element name="addcompatiblehttpheader" type="xs:string" minOccurs="0" maxOccurs="1" />
+			  <xs:element name="allowuseruiculture" type="xs:string" minOccurs="0" maxOccurs="1" />
+			  <xs:element name="enablebrowserlanguage" type="xs:string" minOccurs="0" maxOccurs="1" />			  
             </xs:all>
             <xs:attribute name="sku" type="xs:string"/>
           </xs:complexType>