From 8d8ad7656e84ddd031beefb9147b57f7bc6c6f6e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Dec 2012 02:18:26 -0800 Subject: there are now 2 permalinks - one is the remote original post (plink) and the other is a pointer to a local copy (llink). mod_display is not longer tied to a particular id or channel so if a message is publicly viewable it will appear without any ownership info. --- include/items.php | 8 +++++++- mod/display.php | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index fe29d1635..58abbae48 100755 --- a/include/items.php +++ b/include/items.php @@ -477,7 +477,7 @@ function get_item_elements($x) { $arr['parent_uri'] = (($x['message_top']) ? htmlentities($x['message_top'], ENT_COMPAT,'UTF-8') : ''); $arr['thr_parent'] = (($x['message_parent']) ? htmlentities($x['message_parent'], ENT_COMPAT,'UTF-8') : ''); - $arr['plink'] = (($x['permalink']) ? htmlentities($x['permaplink'], ENT_COMPAT,'UTF-8') : ''); + $arr['plink'] = (($x['permalink']) ? htmlentities($x['permalink'], ENT_COMPAT,'UTF-8') : ''); $arr['location'] = (($x['location']) ? htmlentities($x['location'], ENT_COMPAT,'UTF-8') : ''); $arr['coord'] = (($x['longlat']) ? htmlentities($x['longlat'], ENT_COMPAT,'UTF-8') : ''); $arr['verb'] = (($x['verb']) ? htmlentities($x['verb'], ENT_COMPAT,'UTF-8') : ''); @@ -1217,6 +1217,12 @@ function item_store($arr,$force_parent = false) { $arr['item_flags'] = $arr['item_flags'] | ITEM_UNSEEN; $arr['thr_parent'] = $arr['parent_uri']; + + $arr['llink'] = z_root() . '/display/' . $arr['uri']; + + if(! $arr['plink']) + $arr['plink = $arr['llink']; + if($arr['parent_uri'] === $arr['uri']) { $parent_id = 0; $parent_deleted = 0; diff --git a/mod/display.php b/mod/display.php index 68d4204b2..bc7e3a1c4 100644 --- a/mod/display.php +++ b/mod/display.php @@ -19,6 +19,8 @@ function display_content(&$a) { $a->page['htmlhead'] .= get_markup_template('display-head.tpl'); + + if(argc() > 1) $item_hash = argv(2); -- cgit v1.2.3