https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fbbab82
)
Issue 10050: Improved deletion order
author
Michael
<heluecht@pirati.ca>
Thu, 18 Mar 2021 15:44:02 +0000
(15:44 +0000)
committer
Michael
<heluecht@pirati.ca>
Thu, 18 Mar 2021 15:44:02 +0000
(15:44 +0000)
src/Worker/ExpireAndRemoveUsers.php
patch
|
blob
|
history
diff --git
a/src/Worker/ExpireAndRemoveUsers.php
b/src/Worker/ExpireAndRemoveUsers.php
index
5052fa6
..
949b7de
100644
(file)
--- a/
src/Worker/ExpireAndRemoveUsers.php
+++ b/
src/Worker/ExpireAndRemoveUsers.php
@@
-45,22
+45,21
@@
class ExpireAndRemoveUsers
// Remove any freshly expired account
$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
while ($user = DBA::fetch($users)) {
// Remove any freshly expired account
$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
while ($user = DBA::fetch($users)) {
- User::remove($user['uid']);
+ if ($user['uid'] != 0) {
+ User::remove($user['uid']);
+ }
}
DBA::close($users);
// delete user records for recently removed accounts
}
DBA::close($users);
// delete user records for recently removed accounts
- $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP()
"
]);
+ $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP()
AND `uid` != ?", 0
]);
while ($user = DBA::fetch($users)) {
while ($user = DBA::fetch($users)) {
- // Delete the contacts of this user
- $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
- if (DBA::isResult($self)) {
- DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
- }
-
// We have to delete photo entries by hand because otherwise the photo data won't be deleted
Photo::delete(['uid' => $user['uid']]);
// We have to delete photo entries by hand because otherwise the photo data won't be deleted
Photo::delete(['uid' => $user['uid']]);
+ // Delete the contacts of this user
+ DBA::delete('contact', ['uid' => $user['uid']]);
+
// These tables contain the permissionset which will also be deleted when a user is deleted.
// It seems that sometimes the system wants to delete the records in the wrong order.
// So when the permissionset is deleted and these tables are still filled then an error is thrown.
// These tables contain the permissionset which will also be deleted when a user is deleted.
// It seems that sometimes the system wants to delete the records in the wrong order.
// So when the permissionset is deleted and these tables are still filled then an error is thrown.