porting 7.6@5c5baca into 8

2017-05-30 10:50:09 +02:00
parent 13ec3db2d3
commit d34a425dd1
178 changed files with 3002 additions and 4131 deletions
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -177,7 +177,7 @@ namespace Umbraco.Core.IO
            }

            var filepath = UmbracoConfig.For.UmbracoSettings().Content.UploadAllowDirectories
-                ? Path.Combine(folder, filename)
+                ? Path.Combine(folder, filename).Replace('\\', '/')
                : folder + "-" + filename;

            return filepath;