X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=3415a927c923883e3bb6f1c70b61028a6aff2fc1;hb=5efab810f5ac961995940e8ca4051123334111c2;hp=ffd9d45e2bd19271810c0994831edb9ed517729d;hpb=91db7a549cdd50ea06ca0b53fc20369ad088141b;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index ffd9d45e2b..3415a927c9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -390,7 +390,6 @@ function item_fieldlists() {
/*
These Fields are not added below (yet). They are here to for bug search.
`item`.`type`,
-`item`.`object`,
`item`.`extid`,
`item`.`received`,
`item`.`changed`,
@@ -399,7 +398,6 @@ These Fields are not added below (yet). They are here to for bug search.
`item`.`target`,
`item`.`resource-id`,
`item`.`tag`,
-`item`.`attach`,
`item`.`inform`,
`item`.`pubmail`,
`item`.`visible`,
@@ -424,8 +422,8 @@ These Fields are not added below (yet). They are here to for bug search.
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
- `item`.`location`, `item`.`coord`, `item`.`app`,
- `item`.`rendered-hash`, `item`.`rendered-html`,
+ `item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
+ `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
`item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
@@ -443,7 +441,7 @@ function item_joins() {
return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
NOT `contact`.`blocked` AND NOT `contact`.`pending`
LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
- LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`author-id`";
+ LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`";
}
/**
@@ -676,7 +674,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 +682,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"];
@@ -887,7 +885,7 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
$clean_url = normalise_link($item['author-link']);
if (local_user()) {
- $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1",
dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
if ($r) {
$best_url = 'redir/'.$r[0]['id'];
@@ -1138,7 +1136,7 @@ function format_like($cnt,$arr,$type,$id) {
$explikers = sprintf( t('%s don\'t attend.'), $likers);
break;
case 'attendmaybe':
- $phrase = sprintf( t('%2$d people anttend maybe'), $spanatts, $cnt);
+ $phrase = sprintf( t('%2$d people attend maybe'), $spanatts, $cnt);
$explikers = sprintf( t('%s anttend maybe.'), $likers);
break;
}
@@ -1282,6 +1280,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'),
));