Fixing permanent deletion counter
authorAndyHee <andy@hubup.pro>
Sat, 1 Dec 2018 06:21:54 +0000 (13:21 +0700)
committerAndyHee <andy@hubup.pro>
Sat, 1 Dec 2018 06:21:54 +0000 (13:21 +0700)
mod/admin.php
src/Worker/CronJobs.php

index cedd674..6cd24e9 100644 (file)
@@ -1977,7 +1977,7 @@ function admin_page_users(App $a)
 
                '$h_users' => L10n::t('Users'),
                '$h_newuser' => L10n::t('New User'),
-               '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Delete in')],
+               '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanet deletion')],
                '$th_users' => $th_users,
                '$order_users' => $order,
                '$order_direction_users' => $order_direction,
index 0c565da..164b1cf 100644 (file)
@@ -119,7 +119,7 @@ class CronJobs
                }
 
                // delete user records for recently removed accounts
-               $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
+               $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]);
                while ($user = DBA::fetch($users)) {
                        // Delete the contacts of this user
                        $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);