Fixes passing null to str_contains (#4203)

sreichel · web-flow · commit 1c8a5b812f3b · 2024-09-17T23:40:36.000+02:00
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -409,10 +409,10 @@ public function addGrandTotals($total)
             }
         }
         /*
-         * recalc totals if we have average
+         * recalculate totals if we have average
          */
         foreach ($this->getColumns() as $key => $_column) {
-            if (str_contains($_column->getTotal(), '/')) {
+            if ($_column->hasTotal() && str_contains($_column->getTotal(), '/')) {
                 list($t1, $t2) = explode('/', $_column->getTotal());
                 if ($this->getGrandTotals()->getData($t2) != 0) {
                     $this->getGrandTotals()->setData(

Original file line number	Diff line number	Diff line change
`@@ -409,10 +409,10 @@ public function addGrandTotals($total)`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`	`/*`
`412`		`- * recalc totals if we have average`
	`412`	`+ * recalculate totals if we have average`
`413`	`413`	`*/`
`414`	`414`	`foreach ($this->getColumns() as $key => $_column) {`
`415`		`- if (str_contains($_column->getTotal(), '/')) {`
	`415`	`+ if ($_column->hasTotal() && str_contains($_column->getTotal(), '/')) {`
`416`	`416`	`list($t1, $t2) = explode('/', $_column->getTotal());`
`417`	`417`	`if ($this->getGrandTotals()->getData($t2) != 0) {`
`418`	`418`	`$this->getGrandTotals()->setData(`