Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Dec 11, 2014 · fedb566 · fedb566
2 parents abb293e + cb40e81
commit fedb566
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -16,7 +16,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
@@ -221,11 +221,6 @@ public function doImport()
                         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'];