From 036fc2d2af385a8f3d19ddd4ad5f97754c29b334 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Alleaume <jbanety@gmail.com>
Date: Sat, 9 Jun 2018 00:00:07 +0200
Subject: [PATCH] Modular template extension follows the master page extension
 (#2044)

---
 system/src/Grav/Common/Twig/Twig.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index e1ba281f4..a47a2b7aa 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -238,7 +238,9 @@ class Twig
             // Process Modular Twig
             if ($item->modularTwig()) {
                 $twig_vars['content'] = $content;
-                $template = $item->template() . TEMPLATE_EXT;
+                $extension = $this->grav['uri']->extension();
+                $extension = $extension ? ".{$extension}.twig" : TEMPLATE_EXT;
+                $template = $item->template() . $extension;
                 $output = $content = $local_twig->render($template, $twig_vars);
             }