PHP 7.4 warning in ColumnDelete (#15224)

* PHP 7.4 warning in ColumnDelete fix #15210 * remove tabs * Update ColumnDelete.php * Update ColumnDelete.php * Update ColumnDelete.php * Update ColumnDelete.php * Update ColumnDelete.php
matomo-org · Dec 11, 2019 · 72343bb · 72343bb
1 parent d150c5e
commit 72343bb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
@@ -159,12 +159,18 @@ protected function removeColumnsFromTable(&$table)
             if(!$this->isArrayAccess($row)) {
                 continue;
             }
+
             foreach ($this->columnsToRemove as $column) {
-
-                if (!array_key_exists($column, $row)) {
+
+                if (is_array($row)) {	
+                    if (!array_key_exists($column, $row)) {
+                        continue;
+                    }
+                } elseif ($table instanceof \ArrayAccess) {
+                    if (!$row->offsetExists($column)) {
                     continue;
+                    }
                 }
-
                 if ($this->deleteIfZeroOnly) {
                     $value = $row[$column];
                     if ($value === false || !empty($value)) {