diff options
author | mrjive <mrjive@mrjive.it> | 2018-03-29 17:47:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-29 17:47:50 +0200 |
commit | 20ac91703d54679d2e5080ba2d4985e93986a515 (patch) | |
tree | dca933ae97c7eeaf855d8522163e989317ce918f /Zotlabs/Module/Display.php | |
parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
parent | e06e64823fbecbe67bcf59897ecad6b9c402744e (diff) | |
download | volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.tar.gz volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.tar.bz2 volse-hubzilla-20ac91703d54679d2e5080ba2d4985e93986a515.zip |
Merge pull request #1 from redmatrix/dev
Dev
Diffstat (limited to 'Zotlabs/Module/Display.php')
-rw-r--r-- | Zotlabs/Module/Display.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index fa29ce66c..d3047bc59 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -102,7 +102,7 @@ class Display extends \Zotlabs\Web\Controller { if($decoded) $item_hash = $decoded; - $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, item_blocked from item where mid like '%s' limit 1", + $r = q("select id, uid, mid, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where mid like '%s' limit 1", dbesc($item_hash . '%') ); @@ -110,6 +110,13 @@ class Display extends \Zotlabs\Web\Controller { $target_item = $r[0]; } + $x = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($target_item['author_xchan']) + ); + if($x) { + \App::$poi = $x[0]; + } + //if the item is to be moderated redirect to /moderate if($target_item['item_blocked'] == ITEM_MODERATED) { goaway(z_root() . '/moderate/' . $target_item['id']); @@ -169,6 +176,7 @@ class Display extends \Zotlabs\Web\Controller { } } + $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); |