diff options
| author | Alexander Sulfrian <alex@spline.inf.fu-berlin.de> | 2023-05-15 12:40:52 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2023-05-15 12:42:49 +0200 |
| commit | 9c629e3b9651e0d892c8768afb9c3eac04f16646 (patch) | |
| tree | 8ed1bc8fe1e0ed24760adc16bab0b221fe5aa05c | |
| parent | b4702736fc52780cb848d699d06e73ec3165290b (diff) | |
| download | dokuwiki-9c629e3b9651e0d892c8768afb9c3eac04f16646.tar.gz dokuwiki-9c629e3b9651e0d892c8768afb9c3eac04f16646.tar.bz2 dokuwiki-9c629e3b9651e0d892c8768afb9c3eac04f16646.zip | |
Updates for twig-2+
| -rw-r--r-- | lib/twig.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/twig.php b/lib/twig.php index db1354d..7de451e 100644 --- a/lib/twig.php +++ b/lib/twig.php @@ -1,7 +1,6 @@ <?php -require_once('Twig/Autoloader.php'); -Twig_Autoloader::register(); +require_once('Twig/autoload.php'); class Twig_Loader_Dokuwiki implements Twig_LoaderInterface, Twig_ExistsLoaderInterface { @@ -9,10 +8,16 @@ class Twig_Loader_Dokuwiki implements Twig_LoaderInterface, Twig_ExistsLoaderInt return 'hostinfo:templates:' . cleanID($name); } - public function getSource($name) + public function getSourceContext($name) { $page = $this->build_pagename($name); - return rawWiki($page); + $source = rawWiki($page); + + if (!$source) { + throw new \Twig\Error\LoaderError(sprintf('Template "%s" does not exist.', $name)); + } + + return new \Twig\Source($source, $name); } public function getCacheKey($name) |