lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adding Safe check to Culture. Always get the Name of the culture and do not rely that it is typed in correctly

Browse Source
This commit is contained in:
Nicholas Mayne
2014-08-26 22:34:04 +01:00
parent 5224371f79
commit 1d0c03f4e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
View File

@@ -10,11 +10,11 @@
// Default language for TinyMCE // Default language for TinyMCE
var language = "en"; var language = "en";
var currentCulture = WorkContext.CurrentCulture; var currentCulture = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture);
if (!currentCulture.Equals("en-US", StringComparison.OrdinalIgnoreCase)) { if (!currentCulture.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase)) {
var customLanguage = currentCulture.Replace('-', '_'); var customLanguage = currentCulture.Name.Replace('-', '_');
if (!language.Equals(customLanguage, StringComparison.OrdinalIgnoreCase)) { 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))) { if (virtualPathProvider.TryFileExists(string.Format(@"\modules\tinymce\scripts\langs\{0}.js", customLanguage))) {
language = customLanguage; language = customLanguage;
} }