diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:41:46 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-11-06 15:41:46 +0100 |
| commit | dc32b900c58943df25ae5085c96ad47fc6e67c61 (patch) | |
| tree | 0ce695ad61d406543031ce7b03ec52ab1af10a3d /phpBB/includes/acp | |
| parent | 85898d3d2c7b5ce61a0f92299e06ceade000c4a8 (diff) | |
| parent | ac36cc25ebb4b7ee26228607dd3e171641dea8bd (diff) | |
| download | forums-dc32b900c58943df25ae5085c96ad47fc6e67c61.tar forums-dc32b900c58943df25ae5085c96ad47fc6e67c61.tar.gz forums-dc32b900c58943df25ae5085c96ad47fc6e67c61.tar.bz2 forums-dc32b900c58943df25ae5085c96ad47fc6e67c61.tar.xz forums-dc32b900c58943df25ae5085c96ad47fc6e67c61.zip | |
Merge pull request #4486 from marc1706/ticket/11483
[ticket/11483] Generate user act key if database entry is empty
* github.com:phpbb/phpbb:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 1e453e88ad..008cc02471 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -373,11 +373,6 @@ class acp_users if ($user_row['user_type'] == USER_NORMAL) { user_active_flip('deactivate', $user_id, INACTIVE_REMIND); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_actkey = '" . $db->sql_escape($user_actkey) . "' - WHERE user_id = $user_id"; - $db->sql_query($sql); } else { @@ -386,8 +381,18 @@ class acp_users FROM ' . USERS_TABLE . ' WHERE user_id = ' . $user_id; $result = $db->sql_query($sql); - $user_actkey = (string) $db->sql_fetchfield('user_actkey'); + $user_activation_key = (string) $db->sql_fetchfield('user_actkey'); $db->sql_freeresult($result); + + $user_actkey = empty($user_activation_key) ? $user_actkey : $user_activation_key; + } + + if ($user_row['user_type'] == USER_NORMAL || empty($user_activation_key)) + { + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_actkey = '" . $db->sql_escape($user_actkey) . "' + WHERE user_id = $user_id"; + $db->sql_query($sql); } $messenger = new messenger(false); |