Merge branch 'main' into develop

This commit is contained in:
slawkens
2026-01-28 21:59:46 +01:00
3 changed files with 31 additions and 14 deletions

View File

@@ -23,7 +23,6 @@ use MyAAC\News;
use MyAAC\Plugins;
use MyAAC\Settings;
use PHPMailer\PHPMailer\PHPMailer;
use Twig\Loader\ArrayLoader as Twig_ArrayLoader;
function message($message, $type, $return)
{
@@ -1463,17 +1462,7 @@ function getCustomPage($name, &$success): string
ob_end_clean();
}
else {
$oldLoader = $twig->getLoader();
$twig_loader_array = new Twig_ArrayLoader(array(
'content.html' => $page['body']
));
$twig->setLoader($twig_loader_array);
$content .= $twig->render('content.html');
$twig->setLoader($oldLoader);
$content .= $twig->renderInline($page['body']);
}
}