Skip to content

[4.0] Fix images #35780

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 69 commits into from
Jan 8, 2022
Merged

[4.0] Fix images #35780

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
08cd724
Fix images
dgrammatiko Oct 7, 2021
7fd6a59
menus
dgrammatiko Oct 7, 2021
f2bfbad
Update components/com_contact/tmpl/category/default_items.php
dgrammatiko Oct 8, 2021
ce2e00f
more
dgrammatiko Oct 8, 2021
e10da79
one more
dgrammatiko Oct 8, 2021
45ec5c4
more
dgrammatiko Oct 8, 2021
dc10268
Update components/com_contact/tmpl/contact/default.php
dgrammatiko Oct 8, 2021
7962abb
Update components/com_content/tmpl/category/blog.php
dgrammatiko Oct 8, 2021
c8132ff
Update components/com_newsfeeds/tmpl/category/default.php
dgrammatiko Oct 8, 2021
9a0f4d7
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 8, 2021
6657f4c
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 8, 2021
60633dc
Update modules/mod_articles_news/tmpl/_item.php
dgrammatiko Oct 8, 2021
5d051b0
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 9, 2021
9bed5fc
Undo menu changes, proper invocation of HTMLHelper
dgrammatiko Oct 10, 2021
ee4c197
one more
dgrammatiko Oct 10, 2021
8738949
Use a Layout
dgrammatiko Oct 23, 2021
9aae3cd
one more
dgrammatiko Oct 23, 2021
6810fad
Update components/com_contact/tmpl/contact/default.php
dgrammatiko Oct 23, 2021
707d717
Update components/com_contact/tmpl/contact/default.php
dgrammatiko Oct 23, 2021
47291e5
Update components/com_contact/tmpl/category/default_items.php
dgrammatiko Oct 30, 2021
9d43461
Update components/com_contact/tmpl/contact/default.php
dgrammatiko Oct 30, 2021
5348c56
Update components/com_content/tmpl/category/blog.php
dgrammatiko Oct 30, 2021
19d99ea
Update components/com_newsfeeds/tmpl/category/default.php
dgrammatiko Oct 30, 2021
dd36e11
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 30, 2021
38e61c8
Update modules/mod_articles_news/tmpl/_item.php
dgrammatiko Oct 30, 2021
8efc2a2
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 30, 2021
1c8d811
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Oct 30, 2021
d50b8b0
Simplify the layout/data/etc
dgrammatiko Nov 3, 2021
687d583
meh
dgrammatiko Nov 3, 2021
4c54bb5
Redo
dgrammatiko Nov 3, 2021
6f67b9f
Update image.php
dgrammatiko Nov 4, 2021
a2b71cb
Update layouts/joomla/html/image.php
dgrammatiko Nov 4, 2021
9061a45
Update image.php
dgrammatiko Nov 5, 2021
27d1bc4
Replace title with figure/figcaprion
dgrammatiko Nov 6, 2021
e95e9ee
Update image.php
dgrammatiko Nov 6, 2021
2557b33
Update modules/mod_articles_news/tmpl/_item.php
dgrammatiko Nov 6, 2021
885d9ec
One common jlayout for all images
dgrammatiko Dec 22, 2021
c5fa812
Meh
dgrammatiko Dec 22, 2021
1ce9cf4
oops
dgrammatiko Dec 22, 2021
bcaa805
Remove double escaping
dgrammatiko Dec 23, 2021
a32c810
Remove double escaping
dgrammatiko Dec 23, 2021
6a1dcc6
simplify, the loading part, revert some CS
dgrammatiko Dec 25, 2021
7f2f4fc
Remove unused imports
dgrammatiko Dec 25, 2021
0990be1
use escape in the jLayouts
dgrammatiko Dec 25, 2021
fbbb8cc
Update components/com_content/tmpl/category/blog.php
dgrammatiko Dec 25, 2021
ba3250b
Update components/com_content/tmpl/category/blog.php
dgrammatiko Dec 25, 2021
b976276
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Dec 25, 2021
1877d55
Update layouts/joomla/html/image.php
dgrammatiko Dec 25, 2021
282fa98
Update modules/mod_articles_news/tmpl/_item.php
dgrammatiko Dec 25, 2021
bf34ca0
Update layouts/joomla/html/image.php
dgrammatiko Dec 26, 2021
4fd81ee
Update components/com_contact/tmpl/category/default_items.php
dgrammatiko Dec 26, 2021
7f312c1
Update layouts/joomla/content/intro_image.php
dgrammatiko Dec 28, 2021
4b64a15
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Dec 28, 2021
9cc8b33
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Dec 28, 2021
4865886
comment
dgrammatiko Dec 28, 2021
d0bbb00
the obj reurned from cleanImageURL has a url and attributes
dgrammatiko Dec 30, 2021
6fce942
Update layouts/joomla/html/image.php
dgrammatiko Dec 30, 2021
19ac361
Remove extra isset
dgrammatiko Dec 30, 2021
cad01eb
Update image.php
dgrammatiko Dec 30, 2021
020c806
meh
dgrammatiko Dec 30, 2021
6badaac
use escape
dgrammatiko Dec 30, 2021
bba0545
Update layouts/joomla/html/image.php
dgrammatiko Dec 30, 2021
a782b24
Add missing category image
dgrammatiko Dec 31, 2021
1ec83be
Respect the no Description checkbox
dgrammatiko Dec 31, 2021
d0ba9b8
DO NOT UNSET OBJECT PARTS!
dgrammatiko Dec 31, 2021
49c8ff6
Skip double escaping
dgrammatiko Dec 31, 2021
4d5ff42
CS
dgrammatiko Dec 31, 2021
8f4d6d2
Update components/com_newsfeeds/tmpl/newsfeed/default.php
dgrammatiko Dec 31, 2021
0da6cb4
Merge branch '4.0-dev' into 4.0-dev-images
dgrammatiko Jan 3, 2022
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
9 changes: 8 additions & 1 deletion components/com_contact/tmpl/category/default_items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,14 @@ class="inputbox" onchange="document.adminForm.submit();"
<a href="<?php echo Route::_(RouteHelper::getContactRoute($item->slug, $item->catid, $item->language)); ?>">
<?php if ($this->params->get('show_image_heading')) : ?>
<?php if ($item->image) : ?>
<?php echo HTMLHelper::_('image', $item->image, '', array('class' => 'contact-thumbnail img-thumbnail')); ?>
<?php $imgAttribs = ['class' => 'contact-thumbnail img-thumbnail']; ?>
<?php $img = HTMLHelper::cleanImageURL($item->image); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_('image', htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'), '', $imgAttribs); ?>
<?php endif; ?>
<?php endif; ?>
<?php echo $this->escape($item->name); ?>
Expand Down
13 changes: 10 additions & 3 deletions components/com_contact/tmpl/contact/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,18 @@

<?php if ($this->item->image && $tparams->get('show_image')) : ?>
<div class="com-contact__thumbnail thumbnail">
<?php $imgAttribs = ['itemprop' => 'image']; ?>
<?php $img = HTMLHelper::cleanImageURL($this->item->image); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_(
'image',
$this->item->image,
htmlspecialchars($this->item->name, ENT_QUOTES, 'UTF-8'),
array('itemprop' => 'image')
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
htmlspecialchars($this->item->name, ENT_QUOTES, 'UTF-8'),
$imgAttribs
); ?>
</div>
<?php endif; ?>
Expand Down
15 changes: 13 additions & 2 deletions components/com_content/tmpl/category/blog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,19 @@
<?php if ($beforeDisplayContent || $afterDisplayContent || $this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
<div class="category-desc clearfix">
<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
<?php $alt = empty($this->category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? '' : 'alt="' . htmlspecialchars($this->category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8') . '"'; ?>
<img src="<?php echo $this->category->getParams()->get('image'); ?>" <?php echo $alt; ?>>
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($this->category->getParams()->get('image')); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
empty($this->category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? '' : htmlspecialchars($this->category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
<?php endif; ?>
<?php echo $beforeDisplayContent; ?>
<?php if ($this->params->get('show_description') && $this->category->description) : ?>
Expand Down
14 changes: 13 additions & 1 deletion components/com_newsfeeds/tmpl/category/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,19 @@
<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
<div class="com-newsfeeds-category__description category-desc">
<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
<img src="<?php echo $this->category->getParams()->get('image'); ?>">
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($this->category->getParams()->get('image')); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
empty($this->category->getParams()->get('image_alt')) && empty($this->category->getParams()->get('image_alt_empty')) ? '' : htmlspecialchars($this->category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
<?php endif; ?>
<?php if ($this->params->get('show_description') && $this->category->description) : ?>
<?php echo HTMLHelper::_('content.prepare', $this->category->description, '', 'com_newsfeeds.category'); ?>
Expand Down
59 changes: 44 additions & 15 deletions components/com_newsfeeds/tmpl/newsfeed/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,47 @@
<!-- Show Images from Component -->
<?php if (isset($images->image_first) && !empty($images->image_first)) : ?>
<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
<?php $alt = empty($images->image_first_alt) && empty($images->image_first_alt_empty)
? ''
: 'alt="' . htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8') . '"'; ?>

<div class="com-newsfeeds-newsfeed__first-image img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>">
<img
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($images->image_first); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php if ($images->image_first_caption) : ?>
<?php echo 'class="caption" title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"'; ?>
<?php $imgAttribs['class'] = 'caption'; ?>
<?php $imgAttribs['title'] = htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8'); ?>
Copy link
Contributor

@joomdonation joomdonation Nov 5, 2021

Choose a reason for hiding this comment

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

Sorry, still have question: Why do we use htmlspecialchars here for title instead of handle it in the layout like alt attribute?

Copy link
Contributor Author

@dgrammatiko dgrammatiko Nov 5, 2021

Choose a reason for hiding this comment

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

Although title is an acceptable attribute for images https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attributes and https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes I have no clue if it's a11y correct. We could loop through all the attributes and escape them but it would be tiny slower and also most of the attributes should be fine without escaping (class, id, etc)

Copy link
Contributor

@joomdonation joomdonation Nov 5, 2021

Choose a reason for hiding this comment

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

No, I think we should not loop through all the attributes and escape them. I just think we should move htmlspecialchars for title to the layout (same as alt) to make the code uses layout simpler.

@Fedik Any feedback about this? If all is OK, I will do final test and report test result.

Copy link
Member

@Fedik Fedik Nov 5, 2021

Choose a reason for hiding this comment

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

yeah, just make it as you did for alt

Copy link
Contributor Author

@dgrammatiko dgrammatiko Nov 5, 2021

Choose a reason for hiding this comment

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

Kinda disagree here. The problem is that instead of title the parent layout should used figure and figcaption elements. The title is not a11y correct in this case and the platform already has the solution with the figure element. So, adding title to the img layout will be the wrong solution to the problem…

Copy link
Member

@Fedik Fedik Nov 5, 2021

Choose a reason for hiding this comment

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

then just remove it here from attributes, no one will cry for it ;)
maybe some old legacy thing

Copy link
Contributor Author

@dgrammatiko dgrammatiko Nov 5, 2021

Choose a reason for hiding this comment

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

Yes that’s a legacy thing

Copy link
Contributor Author

@dgrammatiko dgrammatiko Nov 6, 2021

Choose a reason for hiding this comment

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

@Fedik @joomdonation so I swapped the title for a figure/figcaption, let me know if there's something more here

<?php endif; ?>
src="<?php echo htmlspecialchars($images->image_first, ENT_COMPAT, 'UTF-8'); ?>" <?php echo $alt; ?>>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
empty($images->image_first_alt) && empty($images->image_first_alt_empty) ? '' : htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
</div>
<?php endif; ?>

<?php if (isset($images->image_second) and !empty($images->image_second)) : ?>
<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
<?php $alt = empty($images->image_second_alt) && empty($images->image_second_alt_empty)
? ''
: 'alt="' . htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8') . '"'; ?>
<div class="com-newsfeeds-newsfeed__second-image float-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
<img
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($images->image_second); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php if ($images->image_second_caption) : ?>
<?php echo 'class="caption" title="' . htmlspecialchars($images->image_second_caption) . '"'; ?>
<?php $imgAttribs['class'] = 'caption'; ?>
<?php $imgAttribs['title'] = htmlspecialchars($images->image_second_caption, ENT_COMPAT, 'UTF-8'); ?>
<?php endif; ?>
src="<?php echo htmlspecialchars($images->image_second, ENT_COMPAT, 'UTF-8'); ?>" <?php echo $alt; ?>>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
empty($images->image_second_alt) && empty($images->image_second_alt_empty) ? '' : htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
</div>
<?php endif; ?>
<!-- Show Description from Component -->
Expand All @@ -98,9 +115,21 @@
<?php endif; ?>

<!-- Show Image -->
<?php if ($this->rssDoc->image && $this->params->get('show_feed_image')) : ?>
<?php if ($this->rssDoc->image && $this->params->get('show_feed_image')) : ?>
<div class="com-newsfeeds-newsfeed__feed-image">
<img src="<?php echo $this->rssDoc->image->uri; ?>" alt="<?php echo $this->rssDoc->image->title; ?>" />
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($this->rssDoc->image->uri); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
htmlspecialchars($this->rssDoc->image->title, ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
</div>
<?php endif; ?>

Expand Down
27 changes: 20 additions & 7 deletions modules/mod_articles_news/tmpl/_item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,38 @@

defined('_JEXEC') or die;

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Layout\LayoutHelper;
?>
<?php if ($params->get('item_title')) : ?>

<?php $item_heading = $params->get('item_heading', 'h4'); ?>
<<?php echo $item_heading; ?> class="newsflash-title">
<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
<a href="<?php echo $item->link; ?>">
<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
<a href="<?php echo $item->link; ?>">
<?php echo $item->title; ?>
</a>
<?php else : ?>
<?php echo $item->title; ?>
</a>
<?php else : ?>
<?php echo $item->title; ?>
<?php endif; ?>
<?php endif; ?>
</<?php echo $item_heading; ?>>
<?php endif; ?>

<?php if ($params->get('img_intro_full') !== 'none' && !empty($item->imageSrc)) : ?>
<figure class="newsflash-image">
<img src="<?php echo $item->imageSrc; ?>" alt="<?php echo $item->imageAlt; ?>">
<?php $imgAttribs = []; ?>
<?php $img = HTMLHelper::cleanImageURL($item->imageSrc); ?>
<?php if ($img->width > 0 && $img->height > 0) : ?>
<?php $imgAttribs['width'] = $img->width; ?>
<?php $imgAttribs['height'] = $img->height; ?>
<?php $imgAttribs['loading'] = 'lazy'; ?>
<?php endif; ?>
<?php echo HTMLHelper::_(
'image',
htmlspecialchars($img->url, ENT_QUOTES, 'UTF-8'),
htmlspecialchars($item->imageAlt, ENT_COMPAT, 'UTF-8'),
$imgAttribs
); ?>
<?php if (!empty($item->imageCaption)) : ?>
<figcaption>
<?php echo $item->imageCaption; ?>
Expand Down
6 changes: 4 additions & 2 deletions modules/mod_menu/tmpl/default_component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@
{
if ($item->menu_image_css)
{
$img = HTMLHelper::cleanImageURL($item->menu_image);
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::_('image', $img->url, $item->title, $image_attributes);
}
else
{
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::_('image', $img->url, $item->title);
}

if ($itemParams->get('menu_text', 1))
Expand Down
6 changes: 4 additions & 2 deletions modules/mod_menu/tmpl/default_heading.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
{
if ($item->menu_image_css)
{
$img = HTMLHelper::cleanImageURL($item->menu_image);
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::_('image', $img->url, $item->title, $image_attributes);
}
else
{
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::_('image', $img->url, $item->title);
}

if ($itemParams->get('menu_text', 1))
Expand Down
6 changes: 4 additions & 2 deletions modules/mod_menu/tmpl/default_separator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
{
if ($item->menu_image_css)
{
$img = HTMLHelper::cleanImageURL($item->menu_image);
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::_('image', $img->url, $item->title, $image_attributes);
}
else
{
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::_('image', $img->url, $item->title);
}

if ($itemParams->get('menu_text', 1))
Expand Down
6 changes: 4 additions & 2 deletions modules/mod_menu/tmpl/default_url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@
{
if ($item->menu_image_css)
{
$img = HTMLHelper::cleanImageURL($item->menu_image);
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::_('image', $img->url, $item->title, $image_attributes);
}
else
{
$linktype = HTMLHelper::_('image', $item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::_('image', $img->url, $item->title);
}

if ($itemParams->get('menu_text', 1))
Expand Down
3 changes: 2 additions & 1 deletion templates/cassiopeia/html/mod_menu/dropdown-metismenu_component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@

if ($item->menu_image_css)
{
$img = HTMLHelper::cleanImageURL($item->menu_image);
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::image($item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::image($img->url, $item->title, $image_attributes);
}

if ($itemParams->get('menu_text', 1))
Expand Down
6 changes: 4 additions & 2 deletions templates/cassiopeia/html/mod_menu/dropdown-metismenu_heading.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@

if ($item->menu_image)
{
$linktype = HTMLHelper::image($item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::image($img->url, $item->title);

if ($item->menu_image_css)
{
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::image($item->menu_image, $item->title, $image_attributes);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::image($img->url, $item->title, $image_attributes);
}

if ($itemParams->get('menu_text', 1))
Expand Down
5 changes: 3 additions & 2 deletions templates/cassiopeia/html/mod_menu/dropdown-metismenu_separator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@

if ($item->menu_image)
{
$linktype = HTMLHelper::image($item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::image($img->url, $item->title);

if ($item->menu_image_css)
{
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::image($item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::image($img->url, $item->title, $image_attributes);
}

if ($itemParams->get('menu_text', 1))
Expand Down
5 changes: 3 additions & 2 deletions templates/cassiopeia/html/mod_menu/dropdown-metismenu_url.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@

if ($item->menu_image)
{
$linktype = HTMLHelper::image($item->menu_image, $item->title);
$img = HTMLHelper::cleanImageURL($item->menu_image);
$linktype = HTMLHelper::image($img->url, $item->title);

if ($item->menu_image_css)
{
$image_attributes['class'] = $item->menu_image_css;
$linktype = HTMLHelper::image($item->menu_image, $item->title, $image_attributes);
$linktype = HTMLHelper::image($img->url, $item->title, $image_attributes);
}

if ($itemParams->get('menu_text', 1))
Expand Down