From f5a445101d88c632965c17d1e8b0b68e181696ed Mon Sep 17 00:00:00 2001 From: Cody Boucher Date: Mon, 26 Aug 2019 11:02:31 -0400 Subject: [PATCH] use SystemDirectories.Media instead of hardcoded string media (cherry picked from commit 2cdeb38521337f1321a9bd6a2153472afe90db53) --- src/Umbraco.Core/Persistence/Factories/MediaFactory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs index 080a358657..f3300ba424 100644 --- a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs @@ -1,6 +1,7 @@ using System; using System.Globalization; using System.Text.RegularExpressions; +using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Models.Rdbms; @@ -130,7 +131,7 @@ namespace Umbraco.Core.Persistence.Factories return nodeDto; } - private static readonly Regex MediaPathPattern = new Regex(@"(/media/.+?)(?:['""]|$)", RegexOptions.Compiled); + private static readonly Regex MediaPathPattern = new Regex($@"({SystemDirectories.Media.TrimStart("~")}/.+?)(?:['""]|$)", RegexOptions.Compiled); /// /// Try getting a media path out of the string being stored for media