Merge branch 'QA_4_4'

phpmyadmin · Jul 14, 2015 · 6cd7332 · 6cd7332
2 parents 57eb428 + 9614518
commit 6cd7332
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -84,6 +84,7 @@ phpMyAdmin - ChangeLog
 - bug #4976 Timepicker CSS issues in Original theme
 - bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
 - bug #4826 Two inline edit windows
+- bug #4979 Problem when import *.ods file
 
 4.4.11.0 (2015-07-06)
 - bug       Missing selected/entered values when editing active options in visual query builder

diff --git a/libraries/plugins/import/ImportOds.class.php b/libraries/plugins/import/ImportOds.class.php
@@ -220,35 +220,6 @@ public function doImport()
                         }
                         continue;
                     }
-
-                    $attr = $cell->attributes('table', true);
-                    $num_null = (int)$attr['number-columns-repeated'];
-
-                    if ($num_null) {
-                        if (! $col_names_in_first_row) {
-                            for ($i = 0; $i < $num_null; ++$i) {
-                                $tempRow[] = 'NULL';
-                                ++$col_count;
-                            }
-                        } else {
-                            for ($i = 0; $i < $num_null; ++$i) {
-                                $col_names[] = PMA_getColumnAlphaName(
-                                    $col_count + 1
-                                );
-                                ++$col_count;
-                            }
-                        }
-                    } else {
-                        if (! $col_names_in_first_row) {
-                            $tempRow[] = 'NULL';
-                        } else {
-                            $col_names[] = PMA_getColumnAlphaName(
-                                $col_count + 1
-                            );
-                        }
-
-                        ++$col_count;
-                    }
                 } //Endforeach
 
                 /* Find the widest row */