1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-11 03:12:21 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-04-11 21:27:20 +02:00
commit ffcde0c95a

@ -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();
}