From f5a445101d88c632965c17d1e8b0b68e181696ed Mon Sep 17 00:00:00 2001
From: Cody Boucher <cboucher@unionhomemortgage.com>
Date: Mon, 26 Aug 2019 11:02:31 -0400
Subject: [PATCH 1/2] 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);
 
         /// <summary>
         /// Try getting a media path out of the string being stored for media

From 851a2a3de8dc94d99b5a1b3d1d232b70a722aa96 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 21 Aug 2019 10:07:08 +0000
Subject: [PATCH 2/2] Simplify svg check and make it a proper a href again.

---
 .../views/components/media/umb-media-node-info.html    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
index 3f71ae2d18..36fd86175f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
@@ -12,15 +12,9 @@
 
                 <ul ng-if="nodeUrl" class="nav nav-stacked" style="margin-bottom: 0;">
                     <li>
-                        <ng-container ng-if="node.extension != 'svg'">
-                            <a href="{{nodeUrl}}" target="_blank">
-                                <i class="icon icon-window-popin"></i>
-                                <span>{{nodeUrl}}</span>
-                            </a>
-                        </ng-container>
-                        <a ng-if="node.extension == 'svg'">
+                        <a ng-attr-href="{{node.extension !== 'svg' ? nodeUrl : undefined}}" ng-click="node.extension === 'svg' && openSVG()" target="_blank">
                             <i class="icon icon-window-popin"></i>
-                            <span ng-click="openSVG()">{{nodeUrl}}</span>
+                            <span>{{nodeUrl}}</span>
                         </a>
                     </li>
                 </ul>