From 5ed8ef5ef1ada0b5c46724d0e859923e7b209e08 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 29 Jul 2024 23:32:04 +0900 Subject: [PATCH] Fix #2386 layout not visible if only layout.blade.php exists --- modules/layout/layout.model.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 7a15989bc..b3f2f96ad 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -249,7 +249,18 @@ class LayoutModel extends Layout $path = $pathPrefix . $layout; } - return is_readable($path . '/layout.html'); + if (file_exists($path . '/layout.html') && is_readable($path . '/layout.html')) + { + return true; + } + elseif (file_exists($path . '/layout.blade.php') && is_readable($path . '/layout.blade.php')) + { + return true; + } + else + { + return false; + } } /**