From 09cc08ea744ea8e149c8dc338e27740f80dedc86 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 12 Nov 2023 20:09:42 +0100
Subject: [PATCH] [ticket/16944] Unify footer code and clean up code

PHPBB3-16944
---
 phpBB/adm/style/installer_footer.html              | 2 ++
 phpBB/adm/style/overall_footer.html                | 1 +
 phpBB/adm/style/simple_footer.html                 | 1 +
 phpBB/includes/acp/acp_styles.php                  | 3 ---
 phpBB/styles/prosilver/template/simple_footer.html | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 41881d5ff6..0480f34f10 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -26,6 +26,8 @@ installLang = {
 <!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
+{% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify.min.js' %}
+
 {$ICONIFY_ICONS}
 {$SCRIPTS}
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 984a3d96ff..112ef07928 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -45,6 +45,7 @@
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
+{% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify.min.js' %}
 
 <!-- EVENT acp_overall_footer_after -->
 {$ICONIFY_ICONS}
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index 6ad9611bf6..4ffe38aaee 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -19,6 +19,7 @@
 <script src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+{% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify.min.js' %}
 
 <!-- EVENT acp_simple_footer_after -->
 {$ICONIFY_ICONS}
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5dfb05a463..69054eba92 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -367,9 +367,6 @@ class acp_styles
 		// Clear cache
 		$this->cache->purge();
 
-		// Force rebuild of iconify bundle
-		//$this->iconify_bundler->get_bundle(true);
-
 		// Show message
 		trigger_error(implode('<br />', $messages) . adm_back_link($this->u_action), E_USER_NOTICE);
 	}
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 38c1677831..71824a361c 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -46,7 +46,7 @@
 <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS forum_fn.js -->
 <!-- INCLUDEJS ajax.js -->
-<script src="https://code.iconify.design/1/1.0.0-rc7/iconify.min.js"></script>
+{% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify.min.js' %}
 
 <!-- EVENT simple_footer_after -->
 {$ICONIFY_ICONS}