Fixed snippet twig loading.

amteich · Aug 27, 2021 · d4d69a2 · d4d69a2
1 parent 01326da
commit d4d69a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "amteich/kirby-twig",
     "description": "Twig templating support for Kirby CMS",
     "type": "kirby-plugin",
-    "version": "4.1.3",
+    "version": "4.1.4",
     "license": "MIT",
     "authors": [
         {

diff --git a/index.php b/index.php
@@ -28,6 +28,10 @@
                     }
                     else {
                         $file = $kirby->extensions('snippets')[$name] ?? null;
+
+                        if (Str::endsWith(strtolower($file), '.twig')) {
+                            return twig($name . '.twig', $data);
+                        }
                     }
                 }
 

diff --git a/src/classes/Environment.php b/src/classes/Environment.php
@@ -7,6 +7,7 @@
 use Kirby\Cms\App;
 use Kirby\Toolkit\Html;
 use Kirby\Toolkit\Tpl;
+use Kirby\Toolkit\Str;
 
 use \Twig\Environment as Twig_Environment;
 use \Twig\TwigFunction as Twig_Function;
@@ -162,6 +163,13 @@ public function __construct(string $viewPath = '')
             $loader->addPath($kirby->root('templates'));
         }
 
+        // add plugin snippet paths
+        foreach ($kirby->extensions('snippets') as $snippetpath => $root) {
+            if (Str::endsWith(strtolower($root), '.twig')) {
+                $loader->addPath(str_replace($snippetpath . '.twig', '', $root));
+            }
+        }
+
         // is viewpath in a plugin, add the pluginpath
         if ($viewPath != $this->templateDir) {
             $loader->addPath($viewPath);