Fix null provided to count() in tax calculation class (#2162)

iamniels · web-flow · commit 54c4fc7978a9 · 2022-05-30T09:12:53.000+01:00
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php
@@ -209,7 +209,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
     protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $applied, $amount, $baseAmount, $rate)
     {
         $previouslyAppliedTaxes = $address->getAppliedTaxes();
-        $process = count($previouslyAppliedTaxes);
+        $process = is_countable($previouslyAppliedTaxes) ? count($previouslyAppliedTaxes) : 0;
 
         foreach ($applied as $row) {
             if (!isset($previouslyAppliedTaxes[$row['id']])) {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)`
`209`	`209`	`protected function _saveAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $applied, $amount, $baseAmount, $rate)`
`210`	`210`	`{`
`211`	`211`	`$previouslyAppliedTaxes = $address->getAppliedTaxes();`
`212`		`- $process = count($previouslyAppliedTaxes);`
	`212`	`+ $process = is_countable($previouslyAppliedTaxes) ? count($previouslyAppliedTaxes) : 0;`
`213`	`213`
`214`	`214`	`foreach ($applied as $row) {`
`215`	`215`	`if (!isset($previouslyAppliedTaxes[$row['id']])) {`