yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge and file encoding for master pages and templates to have BOM

Browse Source
This commit is contained in:
Shannon
2014-12-29 14:35:54 +11:00
parent 8c619e92d9
commit 3f35ca1e77
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/IO/MasterPageHelper.cs
View File

@@ -51,7 +51,11 @@ namespace Umbraco.Core.IO
if (_masterPageFileSystem.FileExists(filePath) == false || overWrite)
{
masterpageContent = t.Content.IsNullOrWhiteSpace() ? CreateDefaultMasterPageContent(t, templateRepo) : t.Content;
using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(masterpageContent)))
var data = Encoding.UTF8.GetBytes(masterpageContent);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
_masterPageFileSystem.AddFile(filePath, ms, true);
}
@@ -90,7 +94,11 @@ namespace Umbraco.Core.IO
var template = UpdateMasterPageContent(t, currentAlias);
UpdateChildTemplates(t, currentAlias, templateRepo);
var filePath = GetFilePath(t);
using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(template)))
var data = Encoding.UTF8.GetBytes(template);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
_masterPageFileSystem.AddFile(filePath, ms, true);
}

11
src/Umbraco.Core/IO/ViewHelper.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Umbraco.Core.Models;
@@ -83,7 +84,10 @@ namespace Umbraco.Core.IO
var design = template.Content.IsNullOrWhiteSpace() ? EnsureInheritedLayout(template) : template.Content;
var path = ViewPath(template.Alias);
using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(design)))
var data = Encoding.UTF8.GetBytes(design);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
_viewFileSystem.AddFile(path, ms, true);
}
@@ -103,7 +107,10 @@ namespace Umbraco.Core.IO
_viewFileSystem.DeleteFile(oldFile);
}
using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(t.Content)))
var data = Encoding.UTF8.GetBytes(t.Content);
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var ms = new MemoryStream(withBom))
{
_viewFileSystem.AddFile(path, ms, true);
}

3
src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
View File

@@ -214,9 +214,6 @@ namespace Umbraco.Core.Persistence.Repositories
//now do the file work
var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
using (var stream = new MemoryStream(withBom))
if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)
{
var result = _viewHelper.CreateView(template, true);