aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-16 02:18:26 -0800
committerfriendica <info@friendica.com>2012-12-16 02:18:26 -0800
commit8d8ad7656e84ddd031beefb9147b57f7bc6c6f6e (patch)
tree37756078a6ab87ae0613bb3a14fa413f557dfcfc
parent696551222e22d698f2e1bdb0d287c7d7604bb381 (diff)
downloadvolse-hubzilla-8d8ad7656e84ddd031beefb9147b57f7bc6c6f6e.tar.gz
volse-hubzilla-8d8ad7656e84ddd031beefb9147b57f7bc6c6f6e.tar.bz2
volse-hubzilla-8d8ad7656e84ddd031beefb9147b57f7bc6c6f6e.zip
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.
-rwxr-xr-xinclude/items.php8
-rw-r--r--mod/display.php2
2 files changed, 9 insertions, 1 deletions
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);