[6.1] Align all occurancies (#46755)

Author: dgrammatiko

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -370,12 +370,14 @@ public function getFiles()
             $path   = Path::clean($client->path . '/templates/' . $template->element . '/');
             $lang   = Factory::getLanguage();
 
-            // Load the core and/or local language file(s).
+            // Load the parent and child overrides for template language constants
+            if (!empty($template->xmldata->parent)) {
+                $lang->load('tpl_' . $template->xmldata->parent, $client->path)
+                    || $lang->load('tpl_' . $template->xmldata->parent, $client->path . '/templates/' . $template->xmldata->parent);
+            }
+
             $lang->load('tpl_' . $template->element, $client->path)
-            || (!empty($template->xmldata->parent) && $lang->load('tpl_' . $template->xmldata->parent, $client->path))
-            || $lang->load('tpl_' . $template->element, $client->path . '/templates/' . $template->element)
-            || (!empty($template->xmldata->parent) && $lang->load('tpl_' . $template->xmldata->parent, $client->path . '/templates/' . $template->xmldata->parent));
-            $this->element = $path;
+                || $lang->load('tpl_' . $template->element, $client->path . '/templates/' . $template->element);
 
             if (!is_writable($path)) {
                 $app->enqueueMessage(Text::_('COM_TEMPLATES_DIRECTORY_NOT_WRITABLE'), 'error');

components/com_config/src/Model/TemplatesModel.php

@@ -91,11 +91,14 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         $templateObj = Factory::getApplication()->getTemplate(true);
 
-        // Load the core and/or local language file(s).
+        // Load the parent and child overrides for template language constants
+        if (!empty($templateObj->parent)) {
+            $lang->load('tpl_' . $templateObj->parent, JPATH_BASE)
+                || $lang->load('tpl_' . $templateObj->parent, JPATH_BASE . '/templates/' . $templateObj->parent);
+        }
+
         $lang->load('tpl_' . $templateObj->template, JPATH_BASE)
-        || (!empty($templateObj->parent) && $lang->load('tpl_' . $templateObj->parent, JPATH_BASE))
-        || $lang->load('tpl_' . $templateObj->template, JPATH_BASE . '/templates/' . $templateObj->template)
-        || (!empty($templateObj->parent) && $lang->load('tpl_' . $templateObj->parent, JPATH_BASE . '/templates/' . $templateObj->parent));
+            || $lang->load('tpl_' . $templateObj->template, JPATH_BASE . '/templates/' . $templateObj->template);
 
         // Look for com_config.xml, which contains fields to display
         $formFile = Path::clean(JPATH_BASE . '/templates/' . $templateObj->template . '/com_config.xml');