refs #5896 this fixes some tests

2 files changed, 5 insertions, 2 deletions

diff --git a/core/DataTable.php b/core/DataTable.php
index 1e594e4e41..7bf7cceef5 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -1634,6 +1634,9 @@ class DataTable implements DataTableInterface, \IteratorAggregate
         $thisRow->sumRow($row, $copyMeta = true, $this->getMetadata(self::COLUMN_AGGREGATION_OPS_METADATA_NAME));
     }
 
+    /**
+     * @return \ArrayIterator|Row[]
+     */
     public function getIterator() {
         return new \ArrayIterator($this->rows);
     }
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index f9f9773af8..532cd5c644 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -100,7 +100,7 @@ class ColumnDelete extends BaseFilter
 
         // remove columns specified in $this->columnsToRemove
         if (!empty($this->columnsToRemove)) {
-            foreach ($table as $row) {
+            foreach ($table as &$row) {
                 foreach ($this->columnsToRemove as $column) {
                     if ($this->deleteIfZeroOnly) {
                         $value = $row[$column];
@@ -118,7 +118,7 @@ class ColumnDelete extends BaseFilter
 
         // remove columns not specified in $columnsToKeep
         if (!empty($this->columnsToKeep)) {
-            foreach ($table as $row) {
+            foreach ($table as &$row) {
                 foreach ($row as $name => $value) {
 
                     $keep = false;