mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/15538] Drop templates and icons folder, twig file extension

Browse Source 
PHPBB3-15538
This commit is contained in:
mrgoldy
2019-11-30 13:22:11 +01:00
parent ac2b95c1fa
commit c47f9d5744
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/template/twig/extension/icon.php
View File

@@ -98,9 +98,9 @@ class icon extends \Twig\Extension\AbstractExtension
// Iterate over the user's styles and check for icon existance
foreach ($this->get_style_list() as $style_path)
{
if ($filesystem->exists("{$root_path}styles/{$style_path}/theme/icons/png/{$icon}.png"))
if ($filesystem->exists("{$root_path}styles/{$style_path}/theme/png/{$icon}.png"))
{
$source = "{$base_path}styles/{$style_path}/theme/icons/png/{$icon}.png";
$source = "{$base_path}styles/{$style_path}/theme/png/{$icon}.png";
break;
}
@@ -114,7 +114,7 @@ class icon extends \Twig\Extension\AbstractExtension
try
{
// Try to load and prepare the SVG icon
$file = $environment->load('icons/svg/' . $icon . '.svg');
$file = $environment->load('svg/' . $icon . '.svg');
$source = $this->prepare_svg($file);
}
catch (\Twig\Error\LoaderError $e)
@@ -142,14 +142,14 @@ class icon extends \Twig\Extension\AbstractExtension
$base_path = $board_url ? generate_board_url() . '/' : $environment->get_web_root_path();
}
$source = "{$base_path}styles/all/imgs/icons/png/404.png";
$source = "{$base_path}styles/all/imgs/png/404.png";
$type = 'png';
$icon = '404';
}
try
{
return $environment->render("macros/icons/{$type}.html", [
return $environment->render("macros/icons/{$type}.twig", [
'ATTRIBUTES' => (string) $this->implode_attributes($attributes),
'CLASSES' => (string) $classes,
'ICON' => (string) $icon,