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

fixes how bytes are read with utf8 BOM for templates and master pages, fixes unit test

Browse Source
This commit is contained in:
Shannon
2015-01-07 15:11:27 +11:00
parent dc846e7ff6
commit d6f47366d4
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,15 +358,13 @@ namespace Umbraco.Core.Persistence.Repositories
private void PopulateViewTemplate(ITemplate template, string fileName)
{
string content = string.Empty;
string path = string.Empty;
string content;
var path = string.Empty;
using (var stream = _viewsFileSystem.OpenFile(fileName))
using (var reader = new StreamReader(stream, Encoding.UTF8, true))
{
byte[] bytes = new byte[stream.Length];
stream.Position = 0;
stream.Read(bytes, 0, (int)stream.Length);
content = Encoding.UTF8.GetString(bytes);
content = reader.ReadToEnd();
}
template.Path = _viewsFileSystem.GetRelativePath(fileName);
@@ -380,15 +378,13 @@ namespace Umbraco.Core.Persistence.Repositories
private void PopulateMasterpageTemplate(ITemplate template, string fileName)
{
string content = string.Empty;
string path = string.Empty;
string content;
var path = string.Empty;
using (var stream = _masterpagesFileSystem.OpenFile(fileName))
using (var reader = new StreamReader(stream, Encoding.UTF8, true))
{
byte[] bytes = new byte[stream.Length];
stream.Position = 0;
stream.Read(bytes, 0, (int)stream.Length);
content = Encoding.UTF8.GetString(bytes);
content = reader.ReadToEnd();
}
template.Path = _masterpagesFileSystem.GetRelativePath(fileName);