diff options
author | Mario <mario@mariovavti.com> | 2021-02-14 16:16:26 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-02-14 16:16:26 +0000 |
commit | 50e9a12ca546a2c9b40839dc7767e22c4caaa270 (patch) | |
tree | 0535bace1a9c8dcad1516a5d433af4d323305716 | |
parent | 5e8e6dc45805b8eac7a8fb690f04c007ebd573d9 (diff) | |
parent | d6b259bb270d57d6b9bca818d9771b8b25b8221d (diff) | |
download | volse-hubzilla-50e9a12ca546a2c9b40839dc7767e22c4caaa270.tar.gz volse-hubzilla-50e9a12ca546a2c9b40839dc7767e22c4caaa270.tar.bz2 volse-hubzilla-50e9a12ca546a2c9b40839dc7767e22c4caaa270.zip |
Merge branch 'fix-public-permissions-in-display' into 'dev'
FIX: Display urls won't show to permitted remote observers
See merge request hubzilla/core!1909
-rw-r--r-- | Zotlabs/Module/Display.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 04aeb6d5c..2aa4f6548 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -269,17 +269,20 @@ class Display extends \Zotlabs\Web\Controller { $sysid = 0; $r = q("SELECT item.id as item_id from item - WHERE mid = '%s' + WHERE ( (mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND item.deny_gid = '' AND item_private = 0 ) and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) - OR uid = %d ) - $sql_extra ) + OR uid = %d ) ) ) OR + (mid = '%s' $sql_extra ) ) $item_normal limit 1", dbesc($target_item['parent_mid']), - intval($sysid) + intval($sysid), + dbesc($target_item['parent_mid']) ); + + } } |