Merge pull request #84 from east-sussex-county-council/fix-double-slash

JimBobSquarePants · web-flow · commit 9f80406e5825 · 2017-06-23T09:58:55.000+10:00
Media files were being uploaded with paths that started //media
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
@@ -665,10 +665,10 @@ private string ResolveUrl(string path, bool relative)
 
             if (this.UseDefaultRoute)
             {
-                return $"{this.ApplicationVirtualPath}/{Constants.DefaultMediaRoute}/{fixedPath}";
+                return $"{this.ApplicationVirtualPath?.TrimEnd('/')}/{Constants.DefaultMediaRoute}/{fixedPath}";
             }
 
-            return $"{this.ApplicationVirtualPath}/{this.ContainerName}/{fixedPath}";
+            return $"{this.ApplicationVirtualPath?.TrimEnd('/')}/{this.ContainerName}/{fixedPath}";
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -665,10 +665,10 @@ private string ResolveUrl(string path, bool relative)`
`665`	`665`
`666`	`666`	`if (this.UseDefaultRoute)`
`667`	`667`	`{`
`668`		`- return $"{this.ApplicationVirtualPath}/{Constants.DefaultMediaRoute}/{fixedPath}";`
	`668`	`+ return $"{this.ApplicationVirtualPath?.TrimEnd('/')}/{Constants.DefaultMediaRoute}/{fixedPath}";`
`669`	`669`	`}`
`670`	`670`
`671`		`- return $"{this.ApplicationVirtualPath}/{this.ContainerName}/{fixedPath}";`
	`671`	`+ return $"{this.ApplicationVirtualPath?.TrimEnd('/')}/{this.ContainerName}/{fixedPath}";`
`672`	`672`	`}`
`673`	`673`
`674`	`674`	`/// <summary>`