From 98b407218d9954d5dc89615d4bc8a6438c97ebcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 17 May 2017 18:37:51 +0200 Subject: [PATCH] Fixes: - don't do $string[position] anymore, use substr() instead - 'extends' was hanging loose there, rewrote it twice to fix parser error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index d1ccb3c96c..e8384123c4 100644 --- a/include/text.php +++ b/include/text.php @@ -652,14 +652,14 @@ function get_template_file($a, $filename, $root = '') { $theme = current_theme(); // Make sure $root ends with a slash / - if ($root !== '' && $root[strlen($root) - 1] !== '/') { + if ($root !== '' && substr($root, -1, 1) !== '/') { $root = $root . '/'; } if (file_exists("{$root}view/theme/$theme/$filename")) { $template_file = "{$root}view/theme/$theme/$filename"; - } elseif (x($a->theme_info, "extends") && file_exists("{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename")) { - $template_file = "{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename"; + } elseif (x($a->theme_info, "extends") && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename))) { + $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename); } elseif (file_exists("{$root}/$filename")) { $template_file = "{$root}/$filename"; } else {