diff options
| author | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-18 18:45:17 -0800 |
|---|---|---|
| committer | Hubzilla <hubzilla@hz.macgirvin.com> | 2017-01-18 18:45:17 -0800 |
| commit | 7dfadfea4a637ce5566eb45f2d1adedf04bd04f3 (patch) | |
| tree | 2aa74ac5740a103cb9101dffc392a22ef0939b69 /include | |
| parent | d4e58e94f6777f0a7ab5733d889f29bdb9366b14 (diff) | |
| download | volse-hubzilla-7dfadfea4a637ce5566eb45f2d1adedf04bd04f3.tar.gz volse-hubzilla-7dfadfea4a637ce5566eb45f2d1adedf04bd04f3.tar.bz2 volse-hubzilla-7dfadfea4a637ce5566eb45f2d1adedf04bd04f3.zip | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/event.php | 4 | ||||
| -rwxr-xr-x | include/items.php | 4 |
3 files changed, 5 insertions, 5 deletions
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), |