Merge branch '3.2.x'

* 3.2.x:
  [ticket/15090] Ensure send stats module exists before removing
This commit is contained in:
Tristan Darricau 2017-04-16 10:22:01 +02:00
commit 905e189c77
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -32,10 +32,9 @@ class add_help_phpbb extends \phpbb\db\migration\migration
return array( return array(
array('config.add', array('help_send_statistics', true)), array('config.add', array('help_send_statistics', true)),
array('config.add', array('help_send_statistics_time', 0)), array('config.add', array('help_send_statistics_time', 0)),
array('module.remove', array( array('if', array(
'acp', array('module.exists', array('acp', false, 'ACP_SEND_STATISTICS')),
false, array('module.remove', array('acp', false, 'ACP_SEND_STATISTICS')),
'ACP_SEND_STATISTICS',
)), )),
array('module.add', array( array('module.add', array(
'acp', 'acp',