diff options
author | Michal Čihař <michal@cihar.com> | 2017-07-18 13:00:02 +0300 |
---|---|---|
committer | Michal Čihař <michal@cihar.com> | 2017-07-18 13:00:02 +0300 |
commit | d15da74edaf0f9038d5356dab23866097ece0707 (patch) | |
tree | 1013918fa9182cd708ff8a63ed78046a379a3c50 /export.php | |
parent | 9eb7287b72ecd275f0d456eee1c1bd65a340205d (diff) | |
parent | 6e7c6aed7d50714b151fff8b87cdcf0c50037aa7 (diff) |
Merge branch 'QA_4_7'
Diffstat (limited to 'export.php')
-rw-r--r-- | export.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/export.php b/export.php index 1775abf6f3..54a3c2ec9b 100644 --- a/export.php +++ b/export.php @@ -10,6 +10,7 @@ use PhpMyAdmin\Core; use PhpMyAdmin\Encoding; use PMA\libraries\plugins\ExportPlugin; use PhpMyAdmin\Url; +use PhpMyAdmin\Util; use PhpMyAdmin\Sanitize; /** @@ -295,7 +296,7 @@ if (!empty($_REQUEST['aliases'])) { /** * Increase time limit for script execution and initializes some variables */ -@set_time_limit($cfg['ExecTimeLimit']); +Util::setTimeLimit(); if (! empty($cfg['MemoryLimit'])) { @ini_set('memory_limit', $cfg['MemoryLimit']); } |