From 51fe2d0c46052f88f510909ca2d08f05e02c6294 Mon Sep 17 00:00:00 2001 From: Darko Date: Fri, 16 Aug 2019 17:05:49 +0200 Subject: [PATCH 1/2] PHP 7.3 compatibility --- oc-includes/osclass/classes/datatables/DataTable.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/oc-includes/osclass/classes/datatables/DataTable.php b/oc-includes/osclass/classes/datatables/DataTable.php index 150bdaca4c..4c08686611 100644 --- a/oc-includes/osclass/classes/datatables/DataTable.php +++ b/oc-includes/osclass/classes/datatables/DataTable.php @@ -121,8 +121,9 @@ public function sortedColumns() public function sortedRows() { $rows = array(); - $columns = $this->sortedColumns(); - if(count($this->aRows)===0) { + $aRows = (array) $this->aRows; + $columns = (array) $this->sortedColumns(); + if(count($aRows)===0) { return $rows; } foreach($this->aRows as $row) { @@ -160,4 +161,4 @@ public function rawRows() } -?> \ No newline at end of file +?> From 593a1e14b162de689cfc8f66dc58adc956ad2955 Mon Sep 17 00:00:00 2001 From: Darko Date: Fri, 16 Aug 2019 18:38:55 +0200 Subject: [PATCH 2/2] fix --- oc-includes/osclass/classes/datatables/DataTable.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oc-includes/osclass/classes/datatables/DataTable.php b/oc-includes/osclass/classes/datatables/DataTable.php index 4c08686611..9983cc58da 100644 --- a/oc-includes/osclass/classes/datatables/DataTable.php +++ b/oc-includes/osclass/classes/datatables/DataTable.php @@ -126,7 +126,7 @@ public function sortedRows() if(count($aRows)===0) { return $rows; } - foreach($this->aRows as $row) { + foreach($aRows as $row) { $aux_row = array(); foreach($columns as $k => $v) { if(isset($row[$k])) {