29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-17 09:35:35 +00:00

respect the language cascade (#38578)

This commit is contained in:
Dimitris Grammatikogiannis 2022-09-06 10:06:44 +02:00 committed by GitHub
parent 9ba72bded3
commit c93e88c894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -778,8 +778,9 @@ class HtmlDocument extends Document implements CacheControllerFactoryAwareInterf
// 1.5 or core then 1.6
$lang->load('tpl_' . $template, JPATH_BASE)
|| ($inherits !== '' && $lang->load('tpl_' . $inherits, $directory . '/' . $inherits))
|| $lang->load('tpl_' . $template, $directory . '/' . $template);
|| ($inherits !== '' && $lang->load('tpl_' . $inherits, JPATH_BASE))
|| $lang->load('tpl_' . $template, $directory . '/' . $template)
|| ($inherits !== '' && $lang->load('tpl_' . $inherits, $directory . '/' . $inherits));
// Assign the variables
$this->baseurl = Uri::base(true);