Fixes:

- don't do $string[position] anymore, use substr() instead
- 'extends' was hanging loose there, rewrote it twice to fix parser error

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/include/text.php b/include/text.php
index d1ccb3c96cd9e354e41829f45d8636eed355a16a..e8384123c4a64cb2547ab13ca84adf031a493a19 100644 (file)
--- 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 {