diff options
author | Max Kostikov <max@kostikov.co> | 2019-12-05 12:43:00 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-12-05 12:43:00 +0100 |
commit | 88e755037b27647ecb11d5d3bd5d08c401fe3b0d (patch) | |
tree | daea7d42948d2a9cb369fd52f8ef31c0ccea0c33 /Zotlabs | |
parent | 3e833a5bcd127b224f65d5a2cf1677cae6973a0b (diff) | |
parent | cde706748a3bdda1af77251febadb5610a55d6e7 (diff) | |
download | volse-hubzilla-88e755037b27647ecb11d5d3bd5d08c401fe3b0d.tar.gz volse-hubzilla-88e755037b27647ecb11d5d3bd5d08c401fe3b0d.tar.bz2 volse-hubzilla-88e755037b27647ecb11d5d3bd5d08c401fe3b0d.zip |
Merge branch 'dev' into 'dev'
Unpin pinned item on site admin deletion
See merge request hubzilla/core!1801
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Pin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Pin.php b/Zotlabs/Module/Pin.php index 352a056ed..63b28754b 100644 --- a/Zotlabs/Module/Pin.php +++ b/Zotlabs/Module/Pin.php @@ -42,7 +42,7 @@ class Pin extends \Zotlabs\Web\Controller { switch(argv(1)) { case 'pin': - if(! local_channel() || local_channel() != $r[0]['uid']) + if(! local_channel() || (local_channel() != $r[0]['uid'] && local_channel() != is_site_admin())) http_status_exit(403, 'Forbidden'); // Currently allow only one pinned item for each type set_pconfig($r[0]['uid'], 'pinned', $r[0]['item_type'], ($pinned ? [] : [ $midb64 ])); |