diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-06-13 13:34:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-06-13 13:34:04 +0200 |
| commit | 801ab611ede45921d1d6869fa65fc3fbf941d666 (patch) | |
| tree | 9b1f8f24dbd525bd99152a8f58f4e2a384f63ba7 /Zotlabs | |
| parent | bc34167c8490c2dad5fcd6553b27b5df54449c39 (diff) | |
| download | volse-hubzilla-801ab611ede45921d1d6869fa65fc3fbf941d666.tar.gz volse-hubzilla-801ab611ede45921d1d6869fa65fc3fbf941d666.tar.bz2 volse-hubzilla-801ab611ede45921d1d6869fa65fc3fbf941d666.zip | |
more work on linked item/resource deletion for photos and events, deprecate the force flag in drop_item() and comment out goaway() in drop_item().
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index e2bd07c0d..662fddad0 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -191,7 +191,7 @@ class NativeWiki { return array('item' => null, 'success' => false); } else { - $drop = drop_item($item['id'], false, DROPITEM_NORMAL, true); + $drop = drop_item($item['id'], false, DROPITEM_NORMAL); } info( t('Wiki files deleted successfully')); diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index fcb3ca58b..ac08dfa96 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -455,11 +455,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller { if($can_delete || $local_delete) { - q("update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d", - dbesc($event_id), - intval(local_channel()) - ); - // if this is a different page type or it's just a local delete // but not by the item author or owner, do a simple deletion |