From 5bf85c982b2b7f3e63fefb2d8cfea7a8bcc9e591 Mon Sep 17 00:00:00 2001
From: Hannah <lilypickle@hotmail.fr>
Date: Mon, 27 Apr 2020 10:00:12 +0200
Subject: [PATCH] fixes #1179 use standard structure for icons to remove a tag
 in a combined tags search

use standard structure for icons to remove a tag in a combined tags search
The icon displays with 2 tags combined instead of 3
To avoid breaking all themes, we keep the old style by default, but the new style is available. The upgrade to 2.11 documentation will mention it.
---
 include/functions_html.inc.php | 7 ++++---
 themes/default/theme.css       | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 19fdad512..417b5f19f 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -418,7 +418,7 @@ function get_tags_content_title()
       .trigger_change('render_tag_name', $page['tags'][$i]['name'], $page['tags'][$i])
       .'</a>';
 
-    if (count($page['tags']) > 2)
+    if (count($page['tags']) > 1)
     {
       $other_tags = $page['tags'];
       unset($other_tags[$i]);
@@ -429,11 +429,12 @@ function get_tags_content_title()
         );
 
       $title.=
-        '<a href="'.$remove_url.'" style="border:none;" title="'
+        '<a id="TagsGroupRemoveTag" href="'.$remove_url.'" style="border:none;" title="'
         .l10n('remove this tag from the list')
         .'"><img src="'
           .get_root_url().get_themeconf('icon_dir').'/remove_s.png'
-        .'" alt="x" style="vertical-align:bottom;">'
+        .'" alt="x" style="vertical-align:bottom;" >'
+        .'<span class="pwg-icon pwg-icon-close" ></span>'
         .'</a>';
     }
   }
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 3468e3992..4930d6143 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -792,3 +792,8 @@ LEGEND {
 .selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header {
     padding: 0px 5px !important;
 }
+
+
+#TagsGroupRemoveTag span{
+  display:none;
+}
\ No newline at end of file