Skip to content

[2.3] Provide fallback GalleryOptions class when argument missing from layout xml file #23733

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

Closed
gwharton wants to merge 1 commit into from
Closed

[2.3] Provide fallback GalleryOptions class when argument missing from layout xml file #23733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
?>

<?php
// If block argument "gallery_options" is not set in xml layout file, then fallback
// to an instance of \Magento\Catalog\Block\Product\View\GalleryOptions class manually
if ($block->getGalleryOptions() === null) {
$block->setData(
'gallery_options',
\Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Catalog\Block\Product\View\GalleryOptions::class)
Copy link
Contributor

@orlangur orlangur Jul 16, 2019

Choose a reason for hiding this comment

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

Can we obtain it from layout somehow or it's not present? Using ObjectManager in template is quite messy approach.

);
}

$images = $block->getGalleryImages()->getItems();
$mainImage = current(array_filter($images, function ($img) use ($block) {
return $block->isMainImage($img);
Expand Down Expand Up @@ -45,7 +55,7 @@ $mainImageData = $mainImage ?
"data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
"options": <?= /* @noEscape */ $block->getGalleryOptions()->getOptionsJson() ?>,
"fullscreen": <?= /* @noEscape */ $block->getGalleryOptions()->getFSOptionsJson() ?>,
"breakpoints": <?= /* @noEscape */ $block->getBreakpoints() ?>
"breakpoints": <?= /* @noEscape */ $block->getBreakpoints() ?>
}
}
}
Expand Down