diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
| commit | 5b3829aab45d4eb53207c1153fc7c71c72f0f83c (patch) | |
| tree | ceb2251546de94d432fa6160e2e6c80a8a2b50fb /phpBB/phpbb/install/module_base.php | |
| parent | 9ea44abf38f81c696163f45b074c87175c240b69 (diff) | |
| parent | d45f146814a1709a16fb8e4951374242d50b6aed (diff) | |
| download | forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.gz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.bz2 forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.xz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.zip | |
Merge pull request #3794 from CHItA/ticket/14039
[ticket/14039] Refactoring the updater
* CHItA/ticket/14039:
[ticket/14039] Use update helper to include files in container factory
[ticket/14039] Fix inclusion logic in update helper
[ticket/14039] Fix folder creation and deleted binary file issue
[ticket/14039] Fix file check for deleted files
[ticket/14039] Fix acp link
[ticket/14039] Fix ACP link generation
[ticket/14039] Fix constants for the updater
[ticket/14039] Include phpBB constants on startup
[ticket/14039] Fix migrator's language calls
[ticket/14039] Fix misunderstandable comment in the archive file updater
[ticket/14039] Use shared language service in the container factory
[ticket/14039] Fix filesystem file updater's mkdir usage
[ticket/14039] Only show log container when it has content
[ticket/14039] Use compatibility globals from the update package
[ticket/14039] Use http_exception instead of die()
[ticket/14039] Fix T_TEMPLATE_PATH constant
[ticket/14039] Fix language constants and comments
[ticket/14039] Revamp updater
Diffstat (limited to 'phpBB/phpbb/install/module_base.php')
| -rw-r--r-- | phpBB/phpbb/install/module_base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php index a933d4987c..fb68c3aca2 100644 --- a/phpBB/phpbb/install/module_base.php +++ b/phpBB/phpbb/install/module_base.php @@ -115,7 +115,7 @@ abstract class module_base implements module_interface foreach ($this->task_collection as $name => $task) { // Run until there are available resources - if ($this->install_config->get_time_remaining() <= 0 && $this->install_config->get_memory_remaining() <= 0) + if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0) { throw new resource_limit_reached_exception(); } |