diff --git a/ChangeLog b/ChangeLog index 0f708b8626..ab78ef4c0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,8 @@ phpMyAdmin - ChangeLog - bug #4633 Wrong parameter in fetchValue - bug #4634 Error reporting creates an infinite loop - bug #4635 Token mismatch while creating configuration storage -- bug #4640 Incorrect reference to PHP 6 +- bug #4640 Incorrect reference to PHP 6 +- bug #3794 failure to handle repeating empty columns when importing ODS 4.3.1.0 (2014-12-08) - bug #4609 'Show all' checkbox label is not clickable diff --git a/libraries/plugins/import/ImportOds.class.php b/libraries/plugins/import/ImportOds.class.php index eb2cc87246..ca9d3a22a3 100644 --- a/libraries/plugins/import/ImportOds.class.php +++ b/libraries/plugins/import/ImportOds.class.php @@ -221,11 +221,6 @@ class ImportOds extends ImportPlugin continue; } - /* Number of blank columns repeated */ - if ($col_count >= count($row->children('table', true)) - 1) { - continue; - } - $attr = $cell->attributes('table', true); $num_null = (int)$attr['number-columns-repeated'];