Skip to content

[4.0] Fixed the translation of the view type in menuitem #21324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 1, 2018
Merged

[4.0] Fixed the translation of the view type in menuitem #21324

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
15e501e
Fixed the path to the XML-File of a layout in a view of a component.
Jul 27, 2018
37b79a7
Merge branch '4.0-dev' into fixed-the-translation-of-the-view-type-in…
roland-d Jul 31, 2018
5a951dc
Add the path to layout schema for Joomla! 3 component
Jul 31, 2018
6b02e95
Merge remote-tracking branch 'origin/fixed-the-translation-of-the-vie…
Jul 31, 2018
674db82
fixed coding standard
Jul 31, 2018
9fecef3
fixed more coding standard
Jul 31, 2018
5544d40
fixed the path to layout shema for old Joomla! version
Aug 1, 2018
5b4b597
Codestyle
wilsonge Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions administrator/components/com_menus/View/Items/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,18 @@ public function display($tpl = null)
else
{
// Get XML file from component folder for standard layouts
$file = JPATH_SITE . '/components/' . $item->componentname . '/views/' . $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';

$file = JPATH_SITE . '/components/' . $item->componentname . '/tmpl/' . $vars['view']
. '/' . $vars['layout'] . '.xml';

if (!file_exists($file))
{
$file = JPATH_SITE . '/components/' . $item->componentname . '/view/' . $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
$file = JPATH_SITE . '/components/' . $item->componentname . '/views/'
. $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
}
else
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please make this an if file_exists check too (otherwise we'll try and parse a file that doesn't exist none of the 3 exist)

{
$file = JPATH_SITE . '/components/' . $item->componentname . '/view/'
. $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
}
}

Expand Down