Fixes: U4-5981 Umbraco 7.2 Text encoding when saving partial view template

Shazwazza · Shazwazza · commit 28a01d61a6c2 · 2014-12-29T13:50:33.000+11:00
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -100,19 +100,8 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
             if (stream.CanSeek)
                 stream.Seek(0, 0);
 
-            using (var memoryStream = new MemoryStream())
-            {
-                //Add the BOM
-                var bom = new byte[] { 0xEF, 0xBB, 0xBF };
-                memoryStream.Write(bom, 0, bom.Length);
-                stream.CopyTo(memoryStream);
-
-                if (memoryStream.CanSeek)
-                    memoryStream.Seek(0, 0);
-
-                using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
-                    memoryStream.CopyTo(destination);
-            }
+            using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
+                stream.CopyTo(destination);
         }
 
         public IEnumerable<string> GetFiles(string path)
diff --git a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs
@@ -132,7 +132,7 @@ internal virtual void PersistDeletedFolder(Folder entity)
         
         protected virtual void PersistNewItem(TEntity entity)
         {
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))
+            using (var stream = GetContentStream(entity.Content))
             {
                 FileSystem.AddFile(entity.Path, stream, true);
                 entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
@@ -146,7 +146,7 @@ protected virtual void PersistNewItem(TEntity entity)
 
         protected virtual void PersistUpdatedItem(TEntity entity)
         {
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))
+            using (var stream = GetContentStream(entity.Content))
             {
                 FileSystem.AddFile(entity.Path, stream, true);
                 entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
@@ -168,6 +168,16 @@ protected virtual void PersistDeletedItem(TEntity entity)
 
         #endregion
 
+        /// <summary>
+        /// Gets a stream that is used to write to the file
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        protected virtual Stream GetContentStream(string content)
+        {
+            return new MemoryStream(Encoding.UTF8.GetBytes(content));
+        }
+
         protected IEnumerable<string> FindAllFiles(string path)
         {
             var list = new List<string>();
diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using Umbraco.Core.IO;
@@ -79,5 +80,20 @@ public override IEnumerable<PartialView> GetAll(params string[] ids)
                 }
             }
         }
+
+        /// <summary>
+        /// Gets a stream that is used to write to the file
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This ensures the stream includes a utf8 BOM
+        /// </remarks>
+        protected override Stream GetContentStream(string content)
+        {
+            var data = Encoding.UTF8.GetBytes(content);
+            var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
+            return new MemoryStream(withBom);
+        }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
@@ -127,7 +127,10 @@ protected override Guid NodeObjectTypeId
 
         protected override void PersistNewItem(ITemplate entity)
         {
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))
+            var data = Encoding.UTF8.GetBytes(entity.Content);
+            var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
+
+            using (var stream = new MemoryStream(withBom))
             {
                 if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)
                 {
@@ -184,7 +187,10 @@ protected override void PersistNewItem(ITemplate entity)
 
         protected override void PersistUpdatedItem(ITemplate entity)
         {
-            using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))
+            var data = Encoding.UTF8.GetBytes(entity.Content);
+            var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();
+
+            using (var stream = new MemoryStream(withBom))
             {
                 if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)
                 {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ internal virtual void PersistDeletedFolder(Folder entity)`
`132`	`132`
`133`	`133`	`protected virtual void PersistNewItem(TEntity entity)`
`134`	`134`	`{`
`135`		`- using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))`
	`135`	`+ using (var stream = GetContentStream(entity.Content))`
`136`	`136`	`{`
`137`	`137`	`FileSystem.AddFile(entity.Path, stream, true);`
`138`	`138`	`entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;`
`@@ -146,7 +146,7 @@ protected virtual void PersistNewItem(TEntity entity)`
`146`	`146`
`147`	`147`	`protected virtual void PersistUpdatedItem(TEntity entity)`
`148`	`148`	`{`
`149`		`- using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))`
	`149`	`+ using (var stream = GetContentStream(entity.Content))`
`150`	`150`	`{`
`151`	`151`	`FileSystem.AddFile(entity.Path, stream, true);`
`152`	`152`	`entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;`
`@@ -168,6 +168,16 @@ protected virtual void PersistDeletedItem(TEntity entity)`
`168`	`168`
`169`	`169`	`#endregion`
`170`	`170`
	`171`	`+ /// <summary>`
	`172`	`+ /// Gets a stream that is used to write to the file`
	`173`	`+ /// </summary>`
	`174`	`+ /// <param name="content"></param>`
	`175`	`+ /// <returns></returns>`
	`176`	`+ protected virtual Stream GetContentStream(string content)`
	`177`	`+ {`
	`178`	`+ return new MemoryStream(Encoding.UTF8.GetBytes(content));`
	`179`	`+ }`
	`180`	`+`
`171`	`181`	`protected IEnumerable<string> FindAllFiles(string path)`
`172`	`182`	`{`
`173`	`183`	`var list = new List<string>();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.IO;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using System.Text;`
`5`	`6`	`using Umbraco.Core.IO;`
`@@ -79,5 +80,20 @@ public override IEnumerable<PartialView> GetAll(params string[] ids)`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`	`}`
	`83`	`+`
	`84`	`+ /// <summary>`
	`85`	`+ /// Gets a stream that is used to write to the file`
	`86`	`+ /// </summary>`
	`87`	`+ /// <param name="content"></param>`
	`88`	`+ /// <returns></returns>`
	`89`	`+ /// <remarks>`
	`90`	`+ /// This ensures the stream includes a utf8 BOM`
	`91`	`+ /// </remarks>`
	`92`	`+ protected override Stream GetContentStream(string content)`
	`93`	`+ {`
	`94`	`+ var data = Encoding.UTF8.GetBytes(content);`
	`95`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`96`	`+ return new MemoryStream(withBom);`
	`97`	`+ }`
`82`	`98`	`}`
`83`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,10 @@ protected override Guid NodeObjectTypeId`
`127`	`127`
`128`	`128`	`protected override void PersistNewItem(ITemplate entity)`
`129`	`129`	`{`
`130`		`- using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))`
	`130`	`+ var data = Encoding.UTF8.GetBytes(entity.Content);`
	`131`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`132`	`+`
	`133`	`+ using (var stream = new MemoryStream(withBom))`
`131`	`134`	`{`
`132`	`135`	`if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)`
`133`	`136`	`{`
`@@ -184,7 +187,10 @@ protected override void PersistNewItem(ITemplate entity)`
`184`	`187`
`185`	`188`	`protected override void PersistUpdatedItem(ITemplate entity)`
`186`	`189`	`{`
`187`		`- using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(entity.Content)))`
	`190`	`+ var data = Encoding.UTF8.GetBytes(entity.Content);`
	`191`	`+ var withBom = Encoding.UTF8.GetPreamble().Concat(data).ToArray();`
	`192`	`+`
	`193`	`+ using (var stream = new MemoryStream(withBom))`
`188`	`194`	`{`
`189`	`195`	`if (entity.GetTypeOfRenderingEngine() == RenderingEngine.Mvc)`
`190`	`196`	`{`