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

Shazwazza · Shazwazza · commit 3f35ca1e7778 · 2014-12-29T14:35:54.000+11:00
diff --git a/src/Umbraco.Core/IO/MasterPageHelper.cs b/src/Umbraco.Core/IO/MasterPageHelper.cs
@@ -51,7 +51,11 @@ public string CreateMasterPage(ITemplate t, ITemplateRepository templateRepo, bo
             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 @@ public string UpdateMasterPageFile(ITemplate t, string currentAlias, ITemplateRe
             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);
             }
diff --git a/src/Umbraco.Core/IO/ViewHelper.cs b/src/Umbraco.Core/IO/ViewHelper.cs
@@ -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 @@ private string SaveTemplateToFile(ITemplate template)
             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 @@ public string UpdateViewFile(ITemplate t, string currentAlias = null)
                     _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);
             }
diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
@@ -214,9 +214,6 @@ protected override void PersistNewItem(ITemplate entity)
 
             //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);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,11 @@ public string CreateMasterPage(ITemplate t, ITemplateRepository templateRepo, bo`
`51`	`51`	`if (_masterPageFileSystem.FileExists(filePath) == false \|\| overWrite)`
`52`	`52`	`{`
`53`	`53`	`masterpageContent = t.Content.IsNullOrWhiteSpace() ? CreateDefaultMasterPageContent(t, templateRepo) : t.Content;`
`54`		`- using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(masterpageContent)))`
	`54`	`+`
	`55`	`+ var data = Encoding.UTF8.GetBytes(masterpageContent);`
	`56`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`57`	`+`
	`58`	`+ using (var ms = new MemoryStream(withBom))`
`55`	`59`	`{`
`56`	`60`	`_masterPageFileSystem.AddFile(filePath, ms, true);`
`57`	`61`	`}`
`@@ -90,7 +94,11 @@ public string UpdateMasterPageFile(ITemplate t, string currentAlias, ITemplateRe`
`90`	`94`	`var template = UpdateMasterPageContent(t, currentAlias);`
`91`	`95`	`UpdateChildTemplates(t, currentAlias, templateRepo);`
`92`	`96`	`var filePath = GetFilePath(t);`
`93`		`- using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(template)))`
	`97`	`+`
	`98`	`+ var data = Encoding.UTF8.GetBytes(template);`
	`99`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`100`	`+`
	`101`	`+ using (var ms = new MemoryStream(withBom))`
`94`	`102`	`{`
`95`	`103`	`_masterPageFileSystem.AddFile(filePath, ms, true);`
`96`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Text;`
`4`	`5`	`using System.Text.RegularExpressions;`
`5`	`6`	`using Umbraco.Core.Models;`
`@@ -83,7 +84,10 @@ private string SaveTemplateToFile(ITemplate template)`
`83`	`84`	`var design = template.Content.IsNullOrWhiteSpace() ? EnsureInheritedLayout(template) : template.Content;`
`84`	`85`	`var path = ViewPath(template.Alias);`
`85`	`86`
`86`		`- using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(design)))`
	`87`	`+ var data = Encoding.UTF8.GetBytes(design);`
	`88`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`89`	`+`
	`90`	`+ using (var ms = new MemoryStream(withBom))`
`87`	`91`	`{`
`88`	`92`	`_viewFileSystem.AddFile(path, ms, true);`
`89`	`93`	`}`
`@@ -103,7 +107,10 @@ public string UpdateViewFile(ITemplate t, string currentAlias = null)`
`103`	`107`	`_viewFileSystem.DeleteFile(oldFile);`
`104`	`108`	`}`
`105`	`109`
`106`		`- using (var ms = new MemoryStream(Encoding.UTF8.GetBytes(t.Content)))`
	`110`	`+ var data = Encoding.UTF8.GetBytes(t.Content);`
	`111`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`112`	`+`
	`113`	`+ using (var ms = new MemoryStream(withBom))`
`107`	`114`	`{`
`108`	`115`	`_viewFileSystem.AddFile(path, ms, true);`
`109`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,6 @@ protected override void PersistNewItem(ITemplate entity)`
`214`	`214`
`215`	`215`	`//now do the file work`
`216`	`216`
`217`		`- var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
`218`		`-`
`219`		`- using (var stream = new MemoryStream(withBom))`
`220`	`217`	`if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)`
`221`	`218`	`{`
`222`	`219`	`var result = _viewHelper.CreateView(template, true);`