diff options
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Item.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Like.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Subthread.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Tagger.php | 7 |
4 files changed, 6 insertions, 11 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 91a8b1a47..d5fac306b 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -935,7 +935,7 @@ class Item extends \Zotlabs\Web\Controller { 'from_xchan' => $datarray['author_xchan'], 'to_xchan' => $datarray['owner_xchan'], 'item' => $datarray, - 'link' => z_root() . '/display/' . $datarray['mid'], + 'link' => z_root() . '/display/' . urlencode($datarray['mid']), 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $parent, @@ -953,7 +953,7 @@ class Item extends \Zotlabs\Web\Controller { 'from_xchan' => $datarray['author_xchan'], 'to_xchan' => $datarray['owner_xchan'], 'item' => $datarray, - 'link' => z_root() . '/display/' . $datarray['mid'], + 'link' => z_root() . '/display/' . urlencode($datarray['mid']), 'verb' => ACTIVITY_POST, 'otype' => 'item' )); @@ -1005,7 +1005,7 @@ class Item extends \Zotlabs\Web\Controller { } $datarray['id'] = $post_id; - $datarray['llink'] = z_root() . '/display/' . $channel['channel_address'] . '/' . $post_id; + $datarray['llink'] = z_root() . '/display/' . urlencode($datarray['mid']); call_hooks('post_local_end', $datarray); diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 43d318623..c1fefcb89 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -447,7 +447,7 @@ class Like extends \Zotlabs\Web\Controller { $arr['thr_parent'] = $item['mid']; $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . urlencode($item['mid']) . ']' . $post_type . '[/zrl]'; $allow_cid = $item['allow_cid']; $allow_gid = $item['allow_gid']; $deny_cid = $item['deny_cid']; diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php index 0226664d7..2fced8f48 100644 --- a/Zotlabs/Module/Subthread.php +++ b/Zotlabs/Module/Subthread.php @@ -138,7 +138,7 @@ class Subthread extends \Zotlabs\Web\Controller { $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; - $plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]'; + $plink = '[zrl=' . z_root() . '/display/' . urlencode($item['mid']) . ']' . $post_type . '[/zrl]'; $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php index 25f518d53..f6ef66647 100644 --- a/Zotlabs/Module/Tagger.php +++ b/Zotlabs/Module/Tagger.php @@ -60,7 +60,7 @@ class Tagger extends \Zotlabs\Web\Controller { $links = array(array('rel' => 'alternate','type' => 'text/html', - 'href' => z_root() . '/display/' . $item['mid'])); + 'href' => z_root() . '/display/' . urlencode($item['mid']))); $target = json_encode(array( 'type' => $targettype, @@ -81,11 +81,6 @@ class Tagger extends \Zotlabs\Web\Controller { ), )); - - - $link = xmlify('<link rel="alternate" type="text/html" href="' - . z_root() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ; - $tagid = z_root() . '/search?tag=' . $term; $objtype = ACTIVITY_OBJ_TAGTERM; |