diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-31 17:19:42 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-08 01:28:08 +0200 |
| commit | 06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3 (patch) | |
| tree | 23923bb100b08fe4a0e30c5a98cccad8f6148f42 /phpBB/phpbb/install/helper/config.php | |
| parent | 524b98e7bd19bff7b12c7ba4c771d6d60d4300a6 (diff) | |
| download | forums-06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3.tar forums-06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3.tar.gz forums-06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3.tar.bz2 forums-06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3.tar.xz forums-06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3.zip | |
[ticket/13740] CLI installer and fixes
[ci skip]
PHPBB3-13740
Diffstat (limited to 'phpBB/phpbb/install/helper/config.php')
| -rw-r--r-- | phpBB/phpbb/install/helper/config.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php index 5c1348c06d..cf51432332 100644 --- a/phpBB/phpbb/install/helper/config.php +++ b/phpBB/phpbb/install/helper/config.php @@ -147,6 +147,11 @@ class config */ public function get_time_remaining() { + if ($this->system_data['max_execution_time'] <= 0) + { + return 1; + } + return ($this->system_data['start_time'] + $this->system_data['max_execution_time']) - time(); } @@ -157,6 +162,11 @@ class config */ public function get_memory_remaining() { + if ($this->system_data['memory_limit'] <= 0) + { + return 1; + } + if (function_exists('memory_get_usage')) { return ($this->system_data['memory_limit'] - memory_get_usage()); |