From ac2b95c1fa486537bad9dc5a844ef4478914638b Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Wed, 27 Nov 2019 21:01:29 +0100
Subject: [PATCH] [ticket/15538] Update 404 source path to all/imgs

PHPBB3-15538
---
 phpBB/phpbb/template/twig/extension/icon.php | 2 +-
 tests/template/extension_test.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php
index 5376e88973..92dcb38f3b 100644
--- a/phpBB/phpbb/template/twig/extension/icon.php
+++ b/phpBB/phpbb/template/twig/extension/icon.php
@@ -142,7 +142,7 @@ class icon extends \Twig\Extension\AbstractExtension
 				$base_path = $board_url ? generate_board_url() . '/' : $environment->get_web_root_path();
 			}
 
-			$source = "{$base_path}styles/chameleon/theme/icons/png/404.png";
+			$source = "{$base_path}styles/all/imgs/icons/png/404.png";
 			$type = 'png';
 			$icon = '404';
 		}
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index 3a6421da7c..0b40eb9c38 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -386,7 +386,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 				[
 					'ICON_USER'		=> 'User icon',
 				],
-				'<img class="o-icon o-icon-png png-404 my-class" src="phpBB/styles/chameleon/theme/icons/png/404.png" alt="User icon" />',
+				'<img class="o-icon o-icon-png png-404 my-class" src="phpBB/styles/all/imgs/icons/png/404.png" alt="User icon" />',
 			],
 			/** SVG: default */
 			[
@@ -439,7 +439,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 					'attributes'	=> [],
 				],
 				[],
-				'<img class="o-icon o-icon-png png-404" src="phpBB/styles/chameleon/theme/icons/png/404.png" alt="Just a title" />',
+				'<img class="o-icon o-icon-png png-404" src="phpBB/styles/all/imgs/icons/png/404.png" alt="Just a title" />',
 			],
 			/** SVG: Sanitization */
 			[