From 1d0c03f4e892e5c14de8ed4241725d2edf7d3778 Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Tue, 26 Aug 2014 22:34:04 +0100 Subject: [PATCH] Adding Safe check to Culture. Always get the Name of the culture and do not rely that it is typed in correctly --- .../Modules/TinyMce/Views/Body-Html.Editor.cshtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml index 4118af43e..ca3cea476 100644 --- a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml +++ b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml @@ -10,11 +10,11 @@ // Default language for TinyMCE var language = "en"; - var currentCulture = WorkContext.CurrentCulture; - if (!currentCulture.Equals("en-US", StringComparison.OrdinalIgnoreCase)) { - var customLanguage = currentCulture.Replace('-', '_'); + var currentCulture = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture); + if (!currentCulture.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase)) { + var customLanguage = currentCulture.Name.Replace('-', '_'); if (!language.Equals(customLanguage, StringComparison.OrdinalIgnoreCase)) { - var culture = CultureInfo.GetCultureInfo(currentCulture); + var culture = CultureInfo.GetCultureInfo(currentCulture.Name); if (virtualPathProvider.TryFileExists(string.Format(@"\modules\tinymce\scripts\langs\{0}.js", customLanguage))) { language = customLanguage; }