From 3e75aabc6402f6b88a471404f51337a6262e0844 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 17 Apr 2022 22:28:32 +0200
Subject: [PATCH] [ticket/17100] Remove select html for attachments category
 select

PHPBB3-17100
---
 phpBB/adm/style/acp_attachments.html   | 10 ++++++++--
 phpBB/includes/acp/acp_attachments.php | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index a2cfe8f11e..c5f41b464e 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -175,8 +175,14 @@
 			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
-			<dd>{S_CATEGORY_SELECT}</dd>
+			<dt><label for="{{ S_CATEGORY_SELECT.id }}">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dd>
+				<select name="{{ S_CATEGORY_SELECT.name }}" id="{{ S_CATEGORY_SELECT.id }}">
+				{% for option in S_CATEGORY_SELECT.options %}
+					<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
+				{% endfor %}
+				</select>
+			</dd>
 		</dl>
 		<dl>
 			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 0f1fc3f6a8..4e0db21d73 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1445,16 +1445,21 @@ class acp_attachments
 			$cat_type = attachment_category::NONE;
 		}
 
-		$group_select = '<select name="' . $select_name . '"' . (($key) ? ' id="' . $key . '"' : '') . '>';
+		$group_select = [
+			'name'		=> $select_name,
+			'id'		=> $key,
+			'options'	=> [],
+		];
 
 		foreach ($types as $type => $mode)
 		{
-			$selected = ($type == $cat_type) ? ' selected="selected"' : '';
-			$group_select .= '<option value="' . $type . '"' . $selected . '>' . $mode . '</option>';
+			$group_select['options'][] = [
+				'value'		=> $type,
+				'selected'	=> $type == $cat_type,
+				'label'		=> $mode,
+			];
 		}
 
-		$group_select .= '</select>';
-
 		return $group_select;
 	}