diff options
| author | Mario Vavti <mario@mariovavti.com> | 2024-11-08 20:18:20 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2024-11-08 20:18:20 +0100 |
| commit | 0481901b593f861366f9a766e0f020cce7a31be7 (patch) | |
| tree | 9bf66881b0c0564fb6881831d1eaa06df6657e09 /Zotlabs/Lib | |
| parent | 4b4cac63fd4597b5c3090377196c8ad970900b21 (diff) | |
| download | volse-hubzilla-0481901b593f861366f9a766e0f020cce7a31be7.tar.gz volse-hubzilla-0481901b593f861366f9a766e0f020cce7a31be7.tar.bz2 volse-hubzilla-0481901b593f861366f9a766e0f020cce7a31be7.zip | |
refactor drop_item[s]() for containers
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index b7f40f632..9ba145bfa 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1721,9 +1721,9 @@ class Activity { } if (in_array($observer, [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { - drop_item($r[0]['id'], false, (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); + drop_item($r[0]['id'], (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL), observer_hash: $observer); } elseif (in_array($act->actor['id'], [$r[0]['author_xchan'], $r[0]['owner_xchan']])) { - drop_item($r[0]['id'], false, (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); + drop_item($r[0]['id'], (($r[0]['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL)); } sync_an_item($channel['channel_id'], $r[0]['id']); diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index a9b24974d..7eabc074f 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -2423,21 +2423,20 @@ class Libzot { ); } } else { - if ($stored['id'] !== $stored['parent']) { - q( - "update item set commented = '%s', changed = '%s' where id = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($stored['parent']) - ); - } - } + if ($stored['id'] !== $stored['parent']) { + q("update item set commented = '%s', changed = '%s' where id = %d", + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($stored['parent']) + ); + } + } // Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels // and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2). - drop_item($post_id, false, DROPITEM_PHASE1); + drop_item($post_id, DROPITEM_PHASE1, uid: $uid); tag_deliver($uid, $post_id); } |