Upgrade umbraco to 7.5.4

2016-12-13 14:01:21 -05:00
parent c6731f8ef5
commit 0086743882
47 changed files with 3032 additions and 1639 deletions
@@ -1,5 +1,4 @@
@model dynamic
-@using Umbraco.Web.Templates

@functions {
    public static string EditorView(dynamic contentItem)
@@ -1,7 +1,2 @@
@model dynamic
-@using Umbraco.Web.Templates
-
-
-<div class="video-wrapper">
-	@Html.Raw(Model.value)
-</div>
+@Html.Raw(Model.value)
@@ -1,6 +1,4 @@
@inherits UmbracoViewPage<dynamic>
-@using Umbraco.Web.Templates
-

@if (Model.value != null)
 {
@@ -1,5 +1,4 @@
@model dynamic
-@using Umbraco.Web.Templates

@if (Model.value != null)
 {   
@@ -14,7 +13,7 @@
        }
    }
    
-    <img src="@url" alt="@Model.value.caption">
+    <img src="@url" alt="@Model.value.altText">
    
    if (Model.value.caption != null)
    {
@@ -4,8 +4,9 @@
@if (Model.editor.config.markup != null)
 {
    string markup = Model.editor.config.markup.ToString();
-
-    markup = markup.Replace("#value#", Model.value.ToString());
+    var UmbracoHelper = new UmbracoHelper(UmbracoContext.Current);
+    
+    markup = markup.Replace("#value#", UmbracoHelper.ReplaceLineBreaksForHtml(TemplateUtilities.CleanForXss(Model.value.ToString())));
    markup = markup.Replace("#style#", Model.editor.config.style.ToString());

    <text>