From c3b65fd81a5b1218ac461e786ff1e57b4142fe7a Mon Sep 17 00:00:00 2001
From: Daniel James <danielt70@icloud.com>
Date: Sun, 9 Jun 2024 15:47:17 +0100
Subject: [PATCH] [feature/bbcode-icon-name] Update the frontend template vars

PHPBB3-17326
---
 phpBB/includes/functions_display.php                        | 4 ++--
 phpBB/phpbb/db/migration/data/v33x/add_bbcode_font_icon.php | 2 +-
 phpBB/styles/prosilver/template/posting_buttons.html        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index e15b792f9c..41195386e6 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1087,7 +1087,7 @@ function display_custom_bbcodes()
 	$num_predefined_bbcodes = NUM_PREDEFINED_BBCODES;
 
 	$sql_ary = [
-		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_icon_name, b.bbcode_match',
+		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_font_icon, b.bbcode_match',
 		'FROM'		=> [BBCODES_TABLE => 'b'],
 		'WHERE'		=> 'b.display_on_posting = 1',
 		'ORDER_BY'	=> 'b.bbcode_tag',
@@ -1130,7 +1130,7 @@ function display_custom_bbcodes()
 			'BBCODE_TAG'		=> $row['bbcode_tag'],
 			'BBCODE_TAG_CLEAN'	=> str_replace('=', '-', $row['bbcode_tag']),
 			'BBCODE_HELPLINE'	=> $row['bbcode_helpline'],
-			'BBCODE_ICON_NAME'	=> $row['bbcode_icon_name'],
+			'BBCODE_FONT_ICON'	=> $row['bbcode_font_icon'],
 		];
 
 		/**
diff --git a/phpBB/phpbb/db/migration/data/v33x/add_bbcode_font_icon.php b/phpBB/phpbb/db/migration/data/v33x/add_bbcode_font_icon.php
index ab73e0b57a..3dc1da7048 100644
--- a/phpBB/phpbb/db/migration/data/v33x/add_bbcode_font_icon.php
+++ b/phpBB/phpbb/db/migration/data/v33x/add_bbcode_font_icon.php
@@ -32,7 +32,7 @@ class add_bbcode_font_icon extends \phpbb\db\migration\migration
 		return [
 			'add_columns'	=> [
 				$this->table_prefix . 'bbcodes'	=> [
-					'bbcode_font_icon'	=> ['VCHAR_UNI:255', ''],
+					'bbcode_font_icon'	=> ['VCHAR:50', ''],
 				],
 			],
 		];
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index fb8ffaff8f..bfee4f8646 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -97,8 +97,8 @@
 
 	<!-- BEGIN custom_tags -->
 	<button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{{ custom_tags.BBCODE_HELPLINE }}">
-		<!-- IF custom_tags.BBCODE_TAG != '' -->
-			<i class="icon fa-{custom_tags.BBCODE_ICON_NAME} fa-fw" aria-hidden="true"></i>
+		<!-- IF custom_tags.BBCODE_FONT_ICON != '' -->
+			<i class="icon fa-{custom_tags.BBCODE_FONT_ICON} fa-fw" aria-hidden="true"></i>
 		<!-- ELSE -->
 			{custom_tags.BBCODE_TAG}
 		<!-- ENDIF -->