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 2013-12-29 14:10:12 +01:00
commit 077d3de818
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
export.php
View File

@ -241,7 +241,7 @@ if (!defined('TESTSUITE')) {
if (! empty($cfg['MemoryLimit'])) {
@ini_set('memory_limit', $cfg['MemoryLimit']);
}
register_shutdown_function('PMA_shutdown');
register_shutdown_function('PMA_shutdownDuringExport');
// Start with empty buffer
$dump_buffer = '';
$dump_buffer_len = 0;

2
libraries/export.lib.php
View File

@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
*
* @return void
*/
function PMA_shutdown()
function PMA_shutdownDuringExport()
{
$a = error_get_last();
if ($a != null && strpos($a['message'], "execution time")) {