Merge branch '3.2.x'

* 3.2.x:
  [ticket/14510] Prevent infinite loop in add_bots task
This commit is contained in:
Tristan Darricau 2016-03-02 21:51:37 +01:00
commit 0e6bcd166c

View file

@ -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 // 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'); $this->io_handler->add_error_message('CONV_ERROR_INSERT_BOT');
$i++;
continue; continue;
} }