diff options
| author | zotlabs <mike@macgirvin.com> | 2019-07-28 20:00:14 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-07-28 20:00:14 -0700 |
| commit | 70e4a2c4fa69135dea97d1b6323fe6f8e17961c7 (patch) | |
| tree | 38e8f097ec0d9aecb12dcce0bfcf239af37cebbf /include/items.php | |
| parent | 696359daba11c51d8f733dfa173e48b5e1de69ef (diff) | |
| parent | 5695350e98a8a2c802ff419c5b29b0f01f0180df (diff) | |
| download | volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.gz volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.bz2 volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index 4fc659926..84bfc263b 100755 --- a/include/items.php +++ b/include/items.php @@ -3722,13 +3722,12 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) { if(! $interactive) $ok_to_delete = true; - // owner deletion - if(local_channel() && local_channel() == $item['uid']) + // admin deletion + if(is_site_admin()) $ok_to_delete = true; - // sys owned item, requires site admin to delete - $sys = get_sys_channel(); - if(is_site_admin() && $sys['channel_id'] == $item['uid']) + // owner deletion + if(local_channel() && local_channel() == $item['uid']) $ok_to_delete = true; // author deletion |