diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 733f676dbf..a2fe4e66d2 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -79,10 +79,13 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { .show(); import_start = now; } - else if (percent > 9) { + else if (percent > 9 || complete > 2000000) { // calculate estimated time var used_time = now - import_start; var seconds = parseInt(((total - complete) / complete) * used_time / 1000); + var speed = '' + .replace('%s', formatBytes(complete / used_time * 1000, 1, PMA_messages.strDecimalSeperator)); + var minutes = parseInt(seconds / 60); seconds %= 60; var estimated_time; @@ -95,7 +98,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { .replace('%SEC', seconds); } - statustext += '

' + estimated_time; + statustext += '
' + speed + '

' + estimated_time; } var percent_str = Math.round(percent) + '%';