yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CultureInfo.CurrentCulture if UmbracoContext.PublishedContentRequest is not available

Browse Source
This commit is contained in:
Sebastiaan Janssen
2016-02-15 08:27:07 +01:00
parent e4e7c18460
commit f31b6d9c2c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.Text;
using System.Web;
using System.Web.Mvc;
@@ -147,8 +148,10 @@ namespace Umbraco.Web.Mvc
// map the view data (may change its type, may set model to null)
viewData = MapViewDataDictionary(viewData, typeof (TModel));
// bind the model (use context culture as default)
var culture = UmbracoContext.PublishedContentRequest.Culture;
var culture = CultureInfo.CurrentCulture;
// bind the model (use context culture as default, if available)
if (UmbracoContext.PublishedContentRequest != null && UmbracoContext.PublishedContentRequest.Culture != null)
culture = UmbracoContext.PublishedContentRequest.Culture;
viewData.Model = RenderModelBinder.BindModel(viewDataModel, typeof (TModel), culture);
// set the view data