From 22fbbb491068316a71b2feff7014dd828a73a654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 18 Jun 2024 20:17:55 +0200
Subject: [PATCH] Don't add invalid empty target element to navigation links
 (#16341)

---
 .../Views/MenuItemLink-LinkMenuItem.cshtml                | 6 +++++-
 .../TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid | 5 ++++-
 .../TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid | 8 +++++---
 .../TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid   | 5 ++++-
 .../TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid   | 5 ++++-
 .../OrchardCore.Navigation.Core/NavigationItemBuilder.cs  | 2 +-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml
index fe75f0004e6..a26f84572f9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml
@@ -16,7 +16,11 @@
         url = Url.Content(linkMenuItemPart.Url);
     }
 
-    tag.Attributes["target"] = linkMenuItemPart.Target;
+    if (!string.IsNullOrEmpty(linkMenuItemPart.Target))
+    {
+        tag.Attributes["target"] = linkMenuItemPart.Target;
+    }
+
     tag.Attributes["href"] = url;
     tag.InnerHtml.Append(contentItem.DisplayText);
 }
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid
index a05e932748e..b766a591da2 100644
--- a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid
+++ b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid
@@ -1,2 +1,5 @@
 {% assign link = Model.ContentItem.Content.HtmlMenuItemPart %}
-<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
+<a class="nav-link" href="{{ link.Url | href }}"
+    {% if link.Target != null and link.Target != "" %}
+        target="{{ link.Target }}"
+    {% endif %}>{{ link.Html | raw }}</a>
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid
index 19f41cfa9d6..73f1a34533c 100644
--- a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid
+++ b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid
@@ -1,6 +1,8 @@
 {% assign link = Model.ContentItem.Content.LinkMenuItemPart %}
-<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}"
+<a class="nav-link" href="{{ link.Url | href }}"
+    {% if link.Target != null and link.Target != "" %}
+        target="{{ link.Target }}"
+    {% endif %}
     {% if link.Url contains "#" %}
         data-bs-target="{{ link.Url | split: '/' | last }}"
-    {% endif %}>
-{{ Model.ContentItem.DisplayText }}</a>
+    {% endif %}>{{ Model.ContentItem.DisplayText }}</a>
diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid
index e69aaf13cdb..1392b04c3fa 100644
--- a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid
+++ b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid
@@ -3,5 +3,8 @@
 {% if Model.HasItems %}
     <a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ link.Html | raw }}<b class="caret"></b></a>
 {% else %}
-    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
+    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}"
+        {% if link.Target != null and link.Target != "" %}
+            target="{{ link.Target }}"
+        {% endif %}>{{ link.Html | raw }}</a>
 {% endif %}
diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid
index a9ba66cd5a9..b7bfe4b09d5 100644
--- a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid
+++ b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid
@@ -3,5 +3,8 @@
 {% if Model.HasItems %}
     <a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ Model.ContentItem.DisplayText }}<b class="caret"></b></a>
 {% else %}
-    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ Model.ContentItem.DisplayText }}</a>
+    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}"
+        {% if link.Target != null and link.Target != "" %}
+            target="{{ link.Target }}"
+        {% endif %}>{{ Model.ContentItem.DisplayText }}</a>
 {% endif %}
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
index 25c2b0f959a..2737d0e2933 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/NavigationItemBuilder.cs
@@ -49,7 +49,7 @@ public NavigationItemBuilder Url(string url)
         public NavigationItemBuilder Target(string target)
         {
             _item.Target = target;
-            
+
             return this;
         }