This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/magento/app/code/core/Mage/Cms/Block/Block.php b/magento/app/code/core/Mage/Cms/Block/Block.php | |
index 75aab46..3693349 100644 | |
--- a/magento/app/code/core/Mage/Cms/Block/Block.php | |
+++ b/magento/app/code/core/Mage/Cms/Block/Block.php | |
@@ -72,4 +72,19 @@ class Mage_Cms_Block_Block extends Mage_Core_Block_Abstract | |
} | |
return $html; | |
} | |
+ | |
+ /** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/magento/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/magento/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php | |
index c07e179..e3ba1e6 100644 | |
--- a/magento/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php | |
+++ b/magento/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php | |
@@ -111,6 +111,12 @@ | |
// $aggregatorArr = explode('/', $this->getAggregator()); | |
// $this->setValue((int)$aggregatorArr[0])->setAggregator($aggregatorArr[1]); | |
+ // The parent class is passing children of configurable items to this method again | |
+ // this is causing an infinite recursion if we let it pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
return [ | |
'dependencies' => [ | |
'auto' => [ | |
'types' => [ | |
\App\MyService::class => [ | |
'parameters' => [ | |
'config' => new \Zend\Di\Resolver\ServiceInjection('config'), | |
], |