From 077916c82a1c25f45b0803b22d14bd65d08f926c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 11 Dec 2014 13:18:28 +0530 Subject: [PATCH] bug #3794 failure to handle repeating empty columns when importing ODS Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/plugins/import/ImportOds.class.php | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c777e7bbf8..5186c97bf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query - bug #4633 Wrong parameter in fetchValue - bug #4634 Error reporting creates an infinite loop +- 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'];