Fixing FileSystemStore Combine

Fixes #1039
OrchardCMS · Oct 2, 2017 · f75ec38 · f75ec38
1 parent 59cbb03
commit f75ec38
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/OrchardCore/OrchardCore.StorageProviders.FileSystem/FileSystemStore.cs b/src/OrchardCore/OrchardCore.StorageProviders.FileSystem/FileSystemStore.cs
@@ -31,6 +31,12 @@ public string Combine(params string[] paths)
                 combined = "/" + combined;
             }
 
+            // Remove the initial '/' if it was not present
+            if (paths.Length > 0 && !paths[0].StartsWith("/") && combined.StartsWith("/"))
+            {
+                combined = combined.TrimStart('/');
+            }
+
             return combined;
         }