[6.1] Child templates extend language instead of override (#46353)

Author: dgrammatiko

libraries/src/Document/HtmlDocument.php

@@ -773,11 +773,14 @@ protected function _fetchTemplate($params = [])
         // Load the language file for the template
         $lang = CmsFactory::getLanguage();
 
+        if ($inherits) {
+            $lang->load('tpl_' . $inherits, $directory . '/' . $inherits)
+                || $lang->load('tpl_' . $inherits, JPATH_BASE);
+        }
+
         // 1.5 or core then 1.6
         $lang->load('tpl_' . $template, JPATH_BASE)
-            || ($inherits !== '' && $lang->load('tpl_' . $inherits, JPATH_BASE))
-            || $lang->load('tpl_' . $template, $directory . '/' . $template)
-            || ($inherits !== '' && $lang->load('tpl_' . $inherits, $directory . '/' . $inherits));
+            || $lang->load('tpl_' . $template, $directory . '/' . $template);
 
         // Assign the variables
         $this->baseurl  = Uri::base(true);

libraries/src/MVC/View/HtmlView.php

@@ -367,16 +367,22 @@ public function loadTemplate($tpl = null)
         $file = preg_replace('/[^A-Z0-9_\.-]/i', '', $file);
         $tpl  = isset($tpl) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $tpl) : $tpl;
 
-        try {
-            // Load the language file for the template
-            $lang = $this->getLanguage();
-        } catch (\UnexpectedValueException $e) {
-            $lang = Factory::getApplication()->getLanguage();
-        }
+        if (Factory::getApplication()->getDocument()->getType() !== 'html') {
+            try {
+                // Load the language file for the template
+                $lang = $this->getLanguage();
+            } catch (\UnexpectedValueException $e) {
+                $lang = Factory::getApplication()->getLanguage();
+            }
 
-        $lang->load('tpl_' . $template->template, JPATH_BASE)
-            || $lang->load('tpl_' . $template->parent, JPATH_THEMES . '/' . $template->parent)
-            || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+            if ($template->parent) {
+                $lang->load('tpl_' . $template->parent, JPATH_THEMES . '/' . $template->parent)
+                    || $lang->load('tpl_' . $template->parent, JPATH_BASE);
+            }
+
+            $lang->load('tpl_' . $template->template, JPATH_BASE)
+                || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+        }
 
         // Change the template folder if alternative layout is in different template
         if (isset($layoutTemplate) && $layoutTemplate !== '_' && $layoutTemplate != $template->template) {