diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-21 15:00:45 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-08-21 15:00:45 -0700 |
| commit | 894f0156afdb605883af4c3419ead4aec09617da (patch) | |
| tree | 08ef4576df5578cdc18bfa39c9f61aa3c8672173 /Zotlabs/Module/Display.php | |
| parent | 9d5b6858ea627b5eb6115cacd870ef0277f87b2a (diff) | |
| download | volse-hubzilla-894f0156afdb605883af4c3419ead4aec09617da.tar.gz volse-hubzilla-894f0156afdb605883af4c3419ead4aec09617da.tar.bz2 volse-hubzilla-894f0156afdb605883af4c3419ead4aec09617da.zip | |
more work on oembed from /display
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d82ff2a55..5e03f91a9 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -174,6 +174,8 @@ class Display extends \Zotlabs\Web\Controller { '$verb' => '', '$mid' => $item_hash )); + + \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n"; } @@ -218,13 +220,13 @@ class Display extends \Zotlabs\Web\Controller { if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; - +dbg(1); $r = q("SELECT item.id as item_id from item WHERE mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND item.deny_gid = '' AND item_private = 0 ) - and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) + and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) OR uid = %d ) $sql_extra ) $item_normal @@ -232,7 +234,7 @@ class Display extends \Zotlabs\Web\Controller { dbesc($target_item['parent_mid']), intval($sysid) ); - +dbg(0); } } } |