Merge commit 'upstream/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index df92a40ed000addbe70678ddae0200c1eff3932a..f4a5647427b5b5db2f104a542185e24735eef0c1 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                else
                                        $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-
-
-
-
                                $like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
                                $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -810,11 +806,11 @@ function item_photo_menu($item){
        }
 
        $menu = Array(
-               t("View status") => $status_link,
-               t("View profile") => $profile_link,
-               t("View photos") => $photos_link,
-               t("View recent") => $posts_link, 
-               t("Edit contact") => $contact_url,
+               t("View Status") => $status_link,
+               t("View Profile") => $profile_link,
+               t("View Photos") => $photos_link,
+               t("Network Posts") => $posts_link, 
+               t("Edit Contact") => $contact_url,
                t("Send PM") => $pm_url,
        );
        
@@ -1089,4 +1085,3 @@ function render_location_google($item) {
        }
        return $location;
 }
-