gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-12-11 08:54:45 +01:00
commit 8685816f69
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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

5
libraries/plugins/import/ImportOds.class.php
View File

@ -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'];