diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-03-10 16:47:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-03-10 16:47:15 +0100 |
| commit | 2975566650b6eeeac57b215b6448b5fc12b8fc5d (patch) | |
| tree | 3240eb424cbd1d1e26634c790092928656a45ba5 | |
| parent | f2e39f7edd05b5d5fc0f7dd14f7b58126e59e3c1 (diff) | |
| parent | e315ea90b8f0d5763cd657090cadc99f221e8b44 (diff) | |
| download | forums-2975566650b6eeeac57b215b6448b5fc12b8fc5d.tar forums-2975566650b6eeeac57b215b6448b5fc12b8fc5d.tar.gz forums-2975566650b6eeeac57b215b6448b5fc12b8fc5d.tar.bz2 forums-2975566650b6eeeac57b215b6448b5fc12b8fc5d.tar.xz forums-2975566650b6eeeac57b215b6448b5fc12b8fc5d.zip | |
Merge pull request #5539 from 3D-I/ticket/15975
[ticket/15975] Remove user notification data upon user deletion
| -rw-r--r-- | phpBB/includes/functions_user.php | 3 | ||||
| -rw-r--r-- | tests/console/user/base.php | 2 | ||||
| -rw-r--r-- | tests/functions/user_delete_test.php | 2 | ||||
| -rw-r--r-- | tests/functions_user/delete_user_test.php | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 5372a28d18..5f2dea3b94 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -692,7 +692,8 @@ function user_delete($mode, $user_ids, $retain_username = true) PRIVMSGS_RULES_TABLE, $phpbb_container->getParameter('tables.auth_provider_oauth_token_storage'), $phpbb_container->getParameter('tables.auth_provider_oauth_states'), - $phpbb_container->getParameter('tables.auth_provider_oauth_account_assoc') + $phpbb_container->getParameter('tables.auth_provider_oauth_account_assoc'), + $phpbb_container->getParameter('tables.user_notifications') ]; // Ignore errors on deleting from non-existent tables, e.g. when migrating diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 2fb7ee0394..ad328ac893 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -98,6 +98,8 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + parent::setUp(); } diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php index 88680d5719..f419c90e9e 100644 --- a/tests/functions/user_delete_test.php +++ b/tests/functions/user_delete_test.php @@ -86,6 +86,8 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case $phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens'); $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); } public function test_user_delete() diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php index 30253ccc2f..09ed51890c 100644 --- a/tests/functions_user/delete_user_test.php +++ b/tests/functions_user/delete_user_test.php @@ -49,6 +49,8 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case $phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens'); $phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states'); $phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts'); + + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); } public function first_last_post_data() |