makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-04-11 21:27:20 +02:00
commit ffcde0c95a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/install/module_base.php
View file

@ -172,7 +172,7 @@ abstract class module_base implements module_interface
$this->iohandler->send_response(); $this->iohandler->send_response();
// Stop execution if resource limit is reached // 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(); throw new resource_limit_reached_exception();
} }