diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-02 21:51:37 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-02 21:51:37 +0100 |
| commit | 0e6bcd166cd4540b56d57b88b6412309c57b7fbc (patch) | |
| tree | b0221709fd59b4d987c23ec9836d9b43d7557504 /phpBB/phpbb | |
| parent | 43ffffca5f376aacaba9dce85f78dce4e289a1bc (diff) | |
| parent | 942383d74320612ca8d4eb413c1d23459942028a (diff) | |
| download | forums-0e6bcd166cd4540b56d57b88b6412309c57b7fbc.tar forums-0e6bcd166cd4540b56d57b88b6412309c57b7fbc.tar.gz forums-0e6bcd166cd4540b56d57b88b6412309c57b7fbc.tar.bz2 forums-0e6bcd166cd4540b56d57b88b6412309c57b7fbc.tar.xz forums-0e6bcd166cd4540b56d57b88b6412309c57b7fbc.zip | |
Merge branch '3.2.x'
* 3.2.x:
[ticket/14510] Prevent infinite loop in add_bots task
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/install/module/install_data/task/add_bots.php | 1 |
1 files changed, 1 insertions, 0 deletions
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 d45a6839a0..1f1cecceb2 100644 --- a/phpBB/phpbb/install/module/install_data/task/add_bots.php +++ b/phpBB/phpbb/install/module/install_data/task/add_bots.php @@ -214,6 +214,7 @@ class add_bots extends \phpbb\install\task_base // If we can't insert this user then continue to the next one to avoid inconsistent data $this->io_handler->add_error_message('CONV_ERROR_INSERT_BOT'); + $i++; continue; } |