diff options
| author | friendica <info@friendica.com> | 2015-01-21 20:09:51 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-21 20:09:51 -0800 |
| commit | 7d0e0366b946093f81e1ea4e358697fe5a22be64 (patch) | |
| tree | 2748eb54028f9f0b3d8b31471c298058fc600508 | |
| parent | 76fe9dc7023f6d67c19770b46ed639c56bc0ff06 (diff) | |
| parent | cad8228db3a6b3df0ffa01c84bb2d430749f42c9 (diff) | |
| download | volse-hubzilla-7d0e0366b946093f81e1ea4e358697fe5a22be64.tar.gz volse-hubzilla-7d0e0366b946093f81e1ea4e358697fe5a22be64.tar.bz2 volse-hubzilla-7d0e0366b946093f81e1ea4e358697fe5a22be64.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | include/attach.php | 3 | ||||
| -rw-r--r-- | mod/sharedwithme.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/attach.php b/include/attach.php index 673e438bf..a6757744f 100644 --- a/include/attach.php +++ b/include/attach.php @@ -968,7 +968,8 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $ $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; - $links = array( + $links = array(); + $links[] = array( 'rel' => 'alternate', 'type' => 'text/html', 'href' => $url diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index 53884788d..ff93051da 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -1,5 +1,6 @@ <?php require_once('include/conversation.php'); +require_once('include/text.php'); function sharedwithme_content(&$a) { if(! local_user()) { @@ -105,7 +106,7 @@ function sharedwithme_content(&$a) { if($r) { foreach($r as $rr) { $object = json_decode($rr['object'],true); - $url = rawurldecode($object['link']['href']); + $url = rawurldecode(get_rel_link($object['link'],'alternate')); $o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a> <a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>'; } } |