diff options
| author | friendica <info@friendica.com> | 2014-11-28 18:48:38 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-28 18:48:38 -0800 |
| commit | 80ed4193f7141de8fd7ed8cd6ead4aeef5d0a537 (patch) | |
| tree | 0d5d09627c8c79de684b932d06c3be7d8882f053 /include | |
| parent | 123a778ae1495d3223f9de373b4357cd3415b698 (diff) | |
| parent | f852a1f2288c8dc5be30e87b5143a674c0b96890 (diff) | |
| download | volse-hubzilla-80ed4193f7141de8fd7ed8cd6ead4aeef5d0a537.tar.gz volse-hubzilla-80ed4193f7141de8fd7ed8cd6ead4aeef5d0a537.tar.bz2 volse-hubzilla-80ed4193f7141de8fd7ed8cd6ead4aeef5d0a537.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 6db9d3ce4..425a655f7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -915,7 +915,8 @@ function item_photo_menu($item){ if($contact) { $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $contact['abook_id']; - $contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id']; + if (!($contact['abook_flags'] & ABOOK_FLAG_SELF)) + $contact_url = $a->get_baseurl($ssl_state) . '/connedit/' . $contact['abook_id']; $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $contact['abook_id']; $clean_url = normalise_link($item['author-link']); |