Add PATCH_SUPEE-4829_EE_1.14.1.0_v1-2015-02-10-07-57-21.sh

firegento · May 4, 2015 · 8a8f811 · 8a8f811
1 parent 15688c1
commit 8a8f811
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php
@@ -34,6 +34,13 @@ abstract class Mage_ConfigurableSwatches_Block_Catalog_Media_Js_Abstract extends
      */
     abstract public function getProducts();
 
+    /**
+     * A list of blocks that contain products. Used to get the current display mode (grid/list).
+     *
+     * @var array
+     */
+    protected $_productListBlocks = array('product_list', 'search_result_list');
+
     /**
      * json encode image fallback array
      *
@@ -69,11 +76,13 @@ public function getProductImageFallbacks($keepFrame = null) {
         $products = $this->getProducts();
 
         if ($keepFrame === null) {
-            $listBlock = $this->getLayout()->getBlock('product_list');
-            if ($listBlock && $listBlock->getMode() == 'grid') {
-                $keepFrame = true;
-            } else {
-                $keepFrame = false;
+            $keepFrame = false;
+            foreach ($this->_productListBlocks as $blockName) {
+                $listBlock = $this->getLayout()->getBlock($blockName);
+                if ($listBlock && $listBlock->getMode() == 'grid') {
+                    $keepFrame = true;
+                    break;
+                }
             }
         }
 

diff --git a/app/etc/applied.patches.list b/app/etc/applied.patches.list
@@ -21,3 +21,7 @@ patching file lib/Varien/Cache/Backend/Database.php
 patching file api.php
 
 
+-e -n 2015-05-04 02:12:22 UTC | SUPEE-4829 | EE_1.14.1.0 | v1 | 83c162e03b0ff8e34bb7eab884cbc034c1546dd5 | Tue Nov 18 13:45:28 2014 +0200 | v1.14.1.0..HEAD
+patching file app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php
+
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,7 @@ patching file lib/Varien/Cache/Backend/Database.php
		patching file api.php


		-e -n 2015-05-04 02:12:22 UTC \| SUPEE-4829 \| EE_1.14.1.0 \| v1 \| 83c162e03b0ff8e34bb7eab884cbc034c1546dd5 \| Tue Nov 18 13:45:28 2014 +0200 \| v1.14.1.0..HEAD
		patching file app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php