From 7dfadfea4a637ce5566eb45f2d1adedf04bd04f3 Mon Sep 17 00:00:00 2001 From: Hubzilla Date: Wed, 18 Jan 2017 18:45:17 -0800 Subject: urlencode the message-id component of generated /display/ links; in most cases this will be a no-op, unless the message-id is a url of some kind from a different provider. --- include/conversation.php | 2 +- include/event.php | 4 ++-- include/items.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/conversation.php b/include/conversation.php index 0ff368e6e..94cd9168e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -733,7 +733,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'like' => '', 'dislike' => '', 'comment' => '', - 'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . $item['mid'], 'title'=> t('View in context'))), + 'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . urlencode($item['mid']), 'title'=> t('View in context'))), 'previewing' => $previewing, 'wait' => t('Please wait'), 'thread_level' => 1, diff --git a/include/event.php b/include/event.php index f3366fb69..85f14c5f9 100644 --- a/include/event.php +++ b/include/event.php @@ -1016,9 +1016,9 @@ function event_store_item($arr, $event) { // otherwise we'll fallback to /display/$message_id if($wall) - $item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid']; + $item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . urlencode($item_arr['mid']); else - $item_arr['plink'] = z_root() . '/display/' . $item_arr['mid']; + $item_arr['plink'] = z_root() . '/display/' . urlencode($item_arr['mid']); $x = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($arr['event_xchan']) diff --git a/include/items.php b/include/items.php index 7fb5dc5da..da49df397 100755 --- a/include/items.php +++ b/include/items.php @@ -1624,7 +1624,7 @@ logger('revision: ' . $arr['revision']); if($d2 > $d1) $arr['item_delayed'] = 1; - $arr['llink'] = z_root() . '/display/' . $arr['mid']; + $arr['llink'] = z_root() . '/display/' . urlencode($arr['mid']); if(! $arr['plink']) $arr['plink'] = $arr['llink']; @@ -2279,7 +2279,7 @@ function send_status_notifications($post_id,$item) { if($unfollowed) return; - $link = z_root() . '/display/' . $item['mid']; + $link = z_root() . '/display/' . urlencode($item['mid']); $y = q("select id from notify where link = '%s' and uid = %d limit 1", dbesc($link), -- cgit v1.2.3