Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-07-18 12:57:59 +0300
committerMichal Čihař <michal@cihar.com>2017-07-18 12:57:59 +0300
commit6e7c6aed7d50714b151fff8b87cdcf0c50037aa7 (patch)
tree92c85c47923ea0b7cb3b7902b7f110f78d34f4b2 /export.php
parent4b4403aeef448e632b3f14d0fb74c4a748eae3c0 (diff)
Avoid breakage if set_time_limit is disabled
Fixs #13468 Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'export.php')
-rw-r--r--export.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/export.php b/export.php
index 17ec404776..7124602fb8 100644
--- a/export.php
+++ b/export.php
@@ -8,6 +8,7 @@
use PMA\libraries\Encoding;
use PMA\libraries\plugins\ExportPlugin;
use PMA\libraries\URL;
+use PMA\libraries\Util;
use PMA\libraries\Sanitize;
/**
@@ -292,7 +293,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']);
}