#65 url initialized with LinkClick again

DNNCommunity · Sep 21, 2019 · 76260af · 76260af
1 parent 939462c
commit 76260af
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/DataTypes/URL.cs b/DataTypes/URL.cs
@@ -266,9 +266,9 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
                 caption = objTokenReplace.ReplaceEnvironmentTokens(caption, row);
             }
             var isLink = true;
-            var url = "";
             //Link readable by browsers
             link = UrlUtil.StripURL(link);
+            var url  = HttpUtility.HtmlEncode(Globals.LinkClick(link, portalSettings.ActiveTab.TabID, moduleId));
             if (link != string.Empty)
             {
                 switch (Globals.GetURLType(link))
@@ -349,7 +349,6 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
                                 caption = link;
                             }
                         }
-                        url = Globals.LinkClick(link, portalSettings.ActiveTab.TabID, moduleId);
                         break;
 
                     case TabType.Url:
@@ -365,7 +364,7 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
                                 caption = link;
                             }
                         }
-                        if (!field.TrackDownloads)url = link;
+                        if (!field.TrackDownloads) url = link;
                         break;
                 }