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.

This commit is contained in:
friendica 2012-12-16 02:18:26 -08:00
parent 696551222e
commit 8d8ad7656e
2 changed files with 9 additions and 1 deletions

View File

@ -477,7 +477,7 @@ function get_item_elements($x) {
$arr['parent_uri'] = (($x['message_top']) ? htmlentities($x['message_top'], ENT_COMPAT,'UTF-8') : ''); $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['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['location'] = (($x['location']) ? htmlentities($x['location'], ENT_COMPAT,'UTF-8') : '');
$arr['coord'] = (($x['longlat']) ? htmlentities($x['longlat'], 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') : ''); $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['item_flags'] = $arr['item_flags'] | ITEM_UNSEEN;
$arr['thr_parent'] = $arr['parent_uri']; $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']) { if($arr['parent_uri'] === $arr['uri']) {
$parent_id = 0; $parent_id = 0;
$parent_deleted = 0; $parent_deleted = 0;

View File

@ -19,6 +19,8 @@ function display_content(&$a) {
$a->page['htmlhead'] .= get_markup_template('display-head.tpl'); $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
if(argc() > 1) if(argc() > 1)
$item_hash = argv(2); $item_hash = argv(2);