PHP 7.4 warning in ColumnDelete

fix #15210
matomo-org · Dec 2, 2019 · a99d6cb · a99d6cb
1 parent fb0a876
commit a99d6cb
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
@@ -160,11 +160,15 @@ protected function removeColumnsFromTable(&$table)
                 continue;
             }
             foreach ($this->columnsToRemove as $column) {
-
-                if (!array_key_exists($column, $row)) {
-                    continue;
+                if (is_array($row )) {
+                	if (!array_key_exists($column, $row)) {
+		                continue;
+	                }
+                } else {
+                	if (!property_exists($row, $column)) {
+		                continue;
+	                }
                 }
-
                 if ($this->deleteIfZeroOnly) {
                     $value = $row[$column];
                     if ($value === false || !empty($value)) {