array_unshift($sql_values, 0);
break;
case 'archived':
- $sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
+ $sql_extra = " AND (`archive` OR `failed`) AND NOT `blocked` AND NOT `pending`";
break;
case 'pending':
- $sql_extra = " AND `pending` AND NOT `archive` AND ((`rel` = ?)
+ $sql_extra = " AND `pending` AND NOT `archive` AND NOT `failed` AND ((`rel` = ?)
OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))";
$sql_values[] = Model\Contact::SHARING;
break;
default:
- $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
+ $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending` AND NOT `failed`";
break;
}
return $tab_str;
}
- private static function getConversationsHMTL($a, $contact_id, $update)
+ public static function getConversationsHMTL($a, $contact_id, $update, $parent = 0)
{
$o = '';
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';
- $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
-
- Model\Profile::load($a, '', $profiledata, true);
+ if (!$update) {
+ $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
+ Model\Profile::load($a, '', $profiledata, true);
+ }
if ($contact['uid'] == 0) {
- $o .= Model\Contact::getPostsFromId($contact['id'], true, $update);
+ $o .= Model\Contact::getPostsFromId($contact['id'], true, $update, $parent);
} else {
- $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+ $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update, $parent);
}
}