diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index feac58eae2..9adcd62e0b 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -192,7 +192,7 @@ class ImportOds extends ImportPlugin continue; } /* Iterate over columns */ - $cellCount = count($row); + $cellCount = $row->count(); $a = 0; /** @var SimpleXMLElement $cell */ foreach ($row as $cell) { @@ -200,7 +200,7 @@ class ImportOds extends ImportPlugin $text = $cell->children('text', true); $cell_attrs = $cell->attributes('office', true); - if (count($text) != 0) { + if ($text->count() != 0) { $attr = $cell->attributes('table', true); $num_repeat = (int) $attr['number-columns-repeated']; $num_iterations = $num_repeat ?: 1; diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index 658c77ff19..b29866b564 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -237,7 +237,7 @@ class ImportXml extends ImportPlugin /** * Only attempt to analyze/collect data if there is data present */ - if ($xml && @count($xml->children())) { + if ($xml && $xml->children()->count()) { $data_present = true; /**