Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

This commit is contained in:
Weblate 2015-08-19 14:30:13 +02:00
commit 6541323cac
2 changed files with 2 additions and 1 deletions

View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- issue #11387 phpseclib < 2.0 produces deprecated messages on PHP 7
- issue #11404 "Switch to copied table" doesn't work
- issue #11406 Missing quotes after calling "distinct values"
- issue #11386 Cannot import database with long data in one column
4.4.13.1 (2015-08-08)
- issue #11368 SQL error when importing phpMyAdmin dump file

View File

@ -419,7 +419,7 @@ class ImportSql extends ImportPlugin
while (!$error && !$timeout_passed) {
if (false === $delimiterFound) {
$newData = PMA_importGetNextChunk(200);
$newData = PMA_importGetNextChunk();
if ($newData === false) {
// subtract data we didn't handle yet and stop processing
$GLOBALS['offset'] -= $this->_dataLength;