From ff277cd99ca8bfc2b6a70b5561e7e9c03789e45b Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 2 Jun 2015 21:13:29 +0200 Subject: [PATCH] Fixes: U4-6654 NullReferenceException downloading translation xml --- .../businesslogic/translation/Translation.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/umbraco.cms/businesslogic/translation/Translation.cs b/src/umbraco.cms/businesslogic/translation/Translation.cs index 42ca56c574..5b3e27d3b7 100644 --- a/src/umbraco.cms/businesslogic/translation/Translation.cs +++ b/src/umbraco.cms/businesslogic/translation/Translation.cs @@ -8,6 +8,7 @@ using umbraco.cms.businesslogic.language; using umbraco.cms.businesslogic.property; using umbraco.cms.businesslogic.task; using umbraco.cms.businesslogic.web; +using Umbraco.Core; using Umbraco.Core.IO; namespace umbraco.cms.businesslogic.translation @@ -95,10 +96,14 @@ namespace umbraco.cms.businesslogic.translation var props = d.GenericProperties; foreach (Property p in props) { - if (p.Value.GetType() == "".GetType()) + var asString = p.Value as string; + if (asString != null) { - if (p.Value.ToString().Trim() != "") - words += CountWordsInString(p.Value.ToString()); + var trimmed = asString.Trim(); + if (trimmed.IsNullOrWhiteSpace() == false) + { + words += CountWordsInString(trimmed); + } } }