aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-04-11 21:27:12 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-04-11 21:27:12 +0200
commit336f5b49a7f392ea6e979ef188ffda3caa6271b3 (patch)
treea625e9d0e0a1589879f4758b337874f5cc7e3e72 /phpBB/phpbb/install
parentd89b75bd36e9a952462c6c268242fc63cd838f25 (diff)
parentf41c7bd2b16906293498b4eb4073407e57a3567f (diff)
downloadforums-336f5b49a7f392ea6e979ef188ffda3caa6271b3.tar
forums-336f5b49a7f392ea6e979ef188ffda3caa6271b3.tar.gz
forums-336f5b49a7f392ea6e979ef188ffda3caa6271b3.tar.bz2
forums-336f5b49a7f392ea6e979ef188ffda3caa6271b3.tar.xz
forums-336f5b49a7f392ea6e979ef188ffda3caa6271b3.zip
Merge pull request #4285 from CHItA/ticket/14590
[ticket/14590] Prevent refresh requests after the last tasks in modules
Diffstat (limited to 'phpBB/phpbb/install')
-rw-r--r--phpBB/phpbb/install/module_base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php
index 527447b4a1..93c10bd656 100644
--- a/phpBB/phpbb/install/module_base.php
+++ b/phpBB/phpbb/install/module_base.php
@@ -172,7 +172,7 @@ abstract class module_base implements module_interface
$this->iohandler->send_response();
// Stop execution if resource limit is reached
- if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
+ if ($iterator->valid() && ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0))
{
throw new resource_limit_reached_exception();
}