Merge pull request #2682 from annando/1607-api-generic-xml

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index c4d4fcdde80b57273093f3321007842eddb33b24..0340ad3e4a8c8e74f3cde7f8cbcd843fef63c052 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -676,7 +676,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                else
                                        $profile_link = zrl($profile_link);
 
-                               if (!isset($item['author-thumb'])) {
+                               if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
                                        $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
                                        if ($author_contact["thumb"])
                                                $item['author-thumb'] = $author_contact["thumb"];
@@ -684,7 +684,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                                $item['author-thumb'] = $item['author-avatar'];
                                }
 
-                               if (!isset($item['owner-thumb'])) {
+                               if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
                                        $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
                                        if ($owner_contact["thumb"])
                                                $item['owner-thumb'] = $owner_contact["thumb"];
@@ -1282,6 +1282,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                '$private' => t('Private post'),
                '$is_private' => $private_post,
                '$public_link' => $public_post_link,
+
+               //jot nav tab (used in some themes)
+               '$message' => t('Message'),
+               '$browser' => t('Browser'),
        ));