lang order

Author: dgrammatiko

libraries/src/Document/HtmlDocument.php

@@ -774,10 +774,15 @@ protected function _fetchTemplate($params = [])
         $lang = CmsFactory::getLanguage();
 
         // 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));
+        if (!$inherits) {
+            $lang->load('tpl_' . $template, JPATH_BASE)
+                || $lang->load('tpl_' . $template, $directory . '/' . $template);
+        } else {
+            $lang->load('tpl_' . $template, JPATH_BASE)
+                || $lang->load('tpl_' . $template, $directory . '/' . $template);
+            $lang->load('tpl_' . $inherits, $directory . '/' . $inherits)
+                || $lang->load('tpl_' . $inherits, JPATH_BASE);
+        }
 
         // Assign the variables
         $this->baseurl  = Uri::base(true);

libraries/src/MVC/View/HtmlView.php

@@ -376,9 +376,15 @@ public function loadTemplate($tpl = null)
             $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->template, JPATH_BASE)
+                || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+        } else {
+            $lang->load('tpl_' . $template->template, JPATH_BASE)
+                || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+            $lang->load('tpl_' . $template->parent, JPATH_THEMES . '/' . $template->parent)
+                || $lang->load('tpl_' . $template->parent, JPATH_BASE);
+        }
 
         // Change the template folder if alternative layout is in different template
         if (isset($layoutTemplate) && $layoutTemplate !== '_' && $layoutTemplate != $template->template) {