aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2016-02-12 23:30:32 +0100
committerMate Bartus <mate.bartus@gmail.com>2016-02-12 23:30:32 +0100
commit2efceffaebd96fd6d092c4be8c854a7bcf032592 (patch)
treef52836125199b62fb8430788b0deca3fc56567ef
parent97d128a7e4702b5a28b223b177a0e182e3b79080 (diff)
downloadforums-2efceffaebd96fd6d092c4be8c854a7bcf032592.tar
forums-2efceffaebd96fd6d092c4be8c854a7bcf032592.tar.gz
forums-2efceffaebd96fd6d092c4be8c854a7bcf032592.tar.bz2
forums-2efceffaebd96fd6d092c4be8c854a7bcf032592.tar.xz
forums-2efceffaebd96fd6d092c4be8c854a7bcf032592.zip
[ticket/14462] Fix comments
PHPBB3-14462
-rw-r--r--phpBB/phpbb/install/installer.php2
-rw-r--r--phpBB/phpbb/install/module/install_data/task/add_bots.php2
-rw-r--r--phpBB/phpbb/install/module/install_data/task/add_modules.php10
-rw-r--r--phpBB/phpbb/install/module/install_database/task/add_config_settings.php2
-rw-r--r--phpBB/phpbb/install/module/install_database/task/add_default_data.php2
-rw-r--r--phpBB/phpbb/install/module/install_database/task/add_tables.php2
-rw-r--r--phpBB/phpbb/install/module_base.php2
7 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index adf0ec8ac2..b5709e96c7 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -284,7 +284,7 @@ class installer
}
catch (cannot_build_container_exception $e)
{
- // Do not do anything, this is just means there is no config.php yet
+ // Do not do anything, this just means there is no config.php yet
}
}
else
diff --git a/phpBB/phpbb/install/module/install_data/task/add_bots.php b/phpBB/phpbb/install/module/install_data/task/add_bots.php
index b22c8257e4..d45a6839a0 100644
--- a/phpBB/phpbb/install/module/install_data/task/add_bots.php
+++ b/phpBB/phpbb/install/module/install_data/task/add_bots.php
@@ -229,7 +229,7 @@ class add_bots extends \phpbb\install\task_base
$i++;
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
{
break;
diff --git a/phpBB/phpbb/install/module/install_data/task/add_modules.php b/phpBB/phpbb/install/module/install_data/task/add_modules.php
index 2f3a25a9c2..d21a5be823 100644
--- a/phpBB/phpbb/install/module/install_data/task/add_modules.php
+++ b/phpBB/phpbb/install/module/install_data/task/add_modules.php
@@ -243,7 +243,7 @@ class add_modules extends \phpbb\install\task_base
$k++;
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
$timed_out = true;
@@ -300,7 +300,7 @@ class add_modules extends \phpbb\install\task_base
$k++;
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
$timed_out = true;
@@ -310,7 +310,7 @@ class add_modules extends \phpbb\install\task_base
$this->config->set('module_info_index', $k);
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($timed_out)
{
throw new resource_limit_reached_exception();
@@ -322,7 +322,7 @@ class add_modules extends \phpbb\install\task_base
$this->order_modules($module_class);
$this->config->set('modules_ordered', true);
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
throw new resource_limit_reached_exception();
@@ -348,7 +348,7 @@ class add_modules extends \phpbb\install\task_base
$this->config->set('modules_ordered', false);
$this->config->set('module_categories_array', array());
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
break;
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index 5fd99638c2..20b7679ec1 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -329,7 +329,7 @@ class add_config_settings extends \phpbb\install\task_base
$i++;
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
{
break;
diff --git a/phpBB/phpbb/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
index dd1829e6ed..f5157637ee 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_default_data.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_default_data.php
@@ -112,7 +112,7 @@ class add_default_data extends \phpbb\install\task_base
$i++;
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
break;
diff --git a/phpBB/phpbb/install/module/install_database/task/add_tables.php b/phpBB/phpbb/install/module/install_database/task/add_tables.php
index a0b19950be..f344f91582 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_tables.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_tables.php
@@ -114,7 +114,7 @@ class add_tables extends \phpbb\install\task_base
$table_data
);
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->config->get_time_remaining() <= 0 || $this->config->get_memory_remaining() <= 0)
{
break;
diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php
index f75e8cda02..527447b4a1 100644
--- a/phpBB/phpbb/install/module_base.php
+++ b/phpBB/phpbb/install/module_base.php
@@ -171,7 +171,7 @@ abstract class module_base implements module_interface
$this->iohandler->send_response();
- // Run until there are available resources
+ // Stop execution if resource limit is reached
if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0)
{
throw new resource_limit_reached_exception();