diff options
| author | Mario <mario@mariovavti.com> | 2022-01-19 19:14:54 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-01-19 19:14:54 +0000 |
| commit | 1bc9a7373f251533f04a80fbc1aba8d06a3d4167 (patch) | |
| tree | ed1057f5fc45b76534a29c1fceb6bc159cb46997 | |
| parent | 33254b4cac748a1a45f4637a1faf12d061da2f23 (diff) | |
| parent | 23e59b5dccefac89b9e58d49f4498ac4e1034d7a (diff) | |
| download | volse-hubzilla-1bc9a7373f251533f04a80fbc1aba8d06a3d4167.tar.gz volse-hubzilla-1bc9a7373f251533f04a80fbc1aba8d06a3d4167.tar.bz2 volse-hubzilla-1bc9a7373f251533f04a80fbc1aba8d06a3d4167.zip | |
Merge branch 'dev' into 7.0RC
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | include/connections.php | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -20,6 +20,7 @@ Hubzilla 7.0 (2022-??-??) - Improved poll rendering Bugfixes + - Fix items not deleted on remote channel purge - Fix plink in post_activity_item() - Fix multiple update_poll() calls dismissed in queueworker - Fix blocked or ignored contacts displayed in connections diff --git a/include/connections.php b/include/connections.php index a0a9e04a7..dcfcc3985 100644 --- a/include/connections.php +++ b/include/connections.php @@ -286,17 +286,18 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { $dirmode = intval(get_config('system','directory_mode')); - $r = q("delete from photo where xchan = '%s'", dbesc($xchan) ); + $r = q("select resource_id, resource_type, uid, id from item where ( author_xchan = '%s' or owner_xchan = '%s' ) ", dbesc($xchan), dbesc($xchan) ); + if($r) { foreach($r as $rr) { - drop_item($rr,false); + drop_item($rr['id'],false); } } |