From 828352628c82ec94f24e11b9a0fc861d60cccf96 Mon Sep 17 00:00:00 2001
From: punit-vaswani <punit-vaswani@nanomatrixsecure.com>
Date: Wed, 10 Jan 2018 12:14:10 +0800
Subject: [PATCH 1/5] Fix for #11796 Magento2.2.0 home page product grid issues

---
 .../view/frontend/templates/product/widget/content/grid.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 201d6ffe4c683..6efff34fde76c 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,7 +35,7 @@
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php if ($iterator++ != 1): ?></li><?php endif ?>
+                        <?php $iterator++; ?>
                         <li class="product-item">
                         <div class="product-item-info">
                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">

From 1a407e6246ab3b5e7b2333b46364412df50f5bf7 Mon Sep 17 00:00:00 2001
From: punit-vaswani <punit-vaswani@nanomatrixsecure.com>
Date: Wed, 10 Jan 2018 13:08:38 +0800
Subject: [PATCH 2/5] Fix for #11796 Magento2.2.0 home page product grid issues
 (li tag)

---
 .../view/frontend/templates/product/widget/content/grid.phtml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 6efff34fde76c..dfa0c2c948af0 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,8 +35,7 @@
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php $iterator++; ?>
-                        <li class="product-item">
+                        <?= ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>

From c0d59a8e52bdb85b56bfa045875b48c55061e7ae Mon Sep 17 00:00:00 2001
From: punit-vaswani <punit-vaswani@nanomatrixsecure.com>
Date: Wed, 10 Jan 2018 15:33:46 +0800
Subject: [PATCH 3/5] Fix for #11796 (noEscape fix | Travis CI build #7878.6
 fix )

---
 .../view/frontend/templates/product/widget/content/grid.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index dfa0c2c948af0..574cbe1107e88 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,7 +35,7 @@
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?= ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>

From 6181457b10f4f442795f0ca134575378bec95e78 Mon Sep 17 00:00:00 2001
From: punit-vaswani <punit-vaswani@nanomatrixsecure.com>
Date: Wed, 10 Jan 2018 19:31:08 +0800
Subject: [PATCH 4/5] roll back changes by punit-nms user

---
 .../view/frontend/templates/product/widget/content/grid.phtml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 574cbe1107e88..201d6ffe4c683 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,7 +35,8 @@
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php if ($iterator++ != 1): ?></li><?php endif ?>
+                        <li class="product-item">
                         <div class="product-item-info">
                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>

From 15064d91e790dbb9ef230d4b4d05f1ae741214e3 Mon Sep 17 00:00:00 2001
From: punitv <vaswanipunit@gmail.com>
Date: Wed, 10 Jan 2018 19:36:28 +0800
Subject: [PATCH 5/5] re-push fix for #11796 with punitv user

---
 .../view/frontend/templates/product/widget/content/grid.phtml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 201d6ffe4c683..574cbe1107e88 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -35,8 +35,7 @@
                 <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php if ($iterator++ != 1): ?></li><?php endif ?>
-                        <li class="product-item">
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
                             <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>