Update upstream source from tag 'upstream/1.0.10'

Update to upstream version '1.0.10'
with Debian dir e5b7e7fed1
This commit is contained in:
David Prevot 2024-02-13 11:19:38 +01:00
commit 3e3ca1cd40
2 changed files with 6 additions and 16 deletions

View file

@ -1,18 +1,13 @@
<?php
if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
require_once 'Twig/autoload.php';
} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
}
require_once '/usr/share/php/Twig/autoload.php';
class MailNotify {
private static $twig, $adminmail;
public static function init() {
$loader = new Twig_Loader_Filesystem('tpl/mail');
self::$twig = new Twig_Environment($loader, array(
$loader = new Twig\Loader\FilesystemLoader('tpl/mail');
self::$twig = new Twig\Environment($loader, array(
'cache' => false
));

View file

@ -1,11 +1,6 @@
<?php
if (file_exists(stream_resolve_include_path('Twig/autoload.php'))) {
require_once 'Twig/autoload.php';
} elseif (stream_resolve_include_path(file_exists('Twig/Autoloader.php'))) {
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
}
require_once '/usr/share/php/Twig/autoload.php';
class PageController {
public static $alerts=array();
@ -14,8 +9,8 @@ class PageController {
public static function init(LdapServer $server=NULL) {
self::$server = $server;
$loader = new Twig_Loader_Filesystem('tpl/page');
self::$twig = new Twig_Environment($loader, array(
$loader = new Twig\Loader\FilesystemLoader('tpl/page');
self::$twig = new Twig\Environment($loader, array(
'cache' => false
));