Merge branch 'temp-u4-7115' into dev-v7

2017-10-17 14:59:56 +02:00
parent 04f64cd804 7f86166abf
commit 39c534ef54
1 changed files with 5 additions and 1 deletions
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -6,7 +6,11 @@
    string markup = Model.editor.config.markup.ToString();
    var umbracoHelper = new UmbracoHelper(UmbracoContext.Current);
    markup = markup.Replace("#value#", umbracoHelper.ReplaceLineBreaksForHtml(HttpUtility.HtmlEncode(Model.value.ToString())));
-    markup = markup.Replace("#style#", Model.editor.config.style.ToString());
+    
+    if (Model.editor.config.style != null)
+    {
+        markup = markup.Replace("#style#", Model.editor.config.style.ToString());
+    }

    <text>
        @Html.Raw(markup)