Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2025-06-17 09:39:08 +00:00
commit 03031e846d

View file

@ -87,9 +87,12 @@ class twig extends \phpbb\template\base
$this->loader = $twig_environment->getLoader(); $this->loader = $twig_environment->getLoader();
foreach ($extensions as $extension) foreach ($extensions as $extension)
{
if (!$this->twig->hasExtension(get_class($extension)))
{ {
$this->twig->addExtension($extension); $this->twig->addExtension($extension);
} }
}
// Add admin namespace // Add admin namespace
if ($this->path_helper->get_adm_relative_path() !== null if ($this->path_helper->get_adm_relative_path() !== null