Adds theme info file to define 'parent' theme from where load tpl files

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index ea64a3d2820992893d3b1261422e8b2bda05f0cf..656cd8809c927dc1f42ccec54825c94a0ece6686 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -388,11 +388,13 @@ function get_intltext_template($s) {
 
 if(! function_exists('get_markup_template')) {
 function get_markup_template($s) {
-
+       $a=get_app();
        $theme = current_theme();
        
        if(file_exists("view/theme/$theme/$s"))
                return file_get_contents("view/theme/$theme/$s");
+       elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s"))
+               return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s");
        else
                return file_get_contents("view/$s");