Merge pull request #9388 from vinzv/9383-frio-cannot-scroll-left-flyout-sidebar-on...

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 03d67aa08944a5772451d2a973f55e092f0f5f4e..85b3bb423937f3b582c999725a0b0fed751c29bf 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -652,15 +652,15 @@ class Contact extends BaseModule
                                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;
                }
 
@@ -921,7 +921,7 @@ class Contact extends BaseModule
                return $tab_str;
        }
 
-       private static function getConversationsHMTL($a, $contact_id, $update)
+       public static function getConversationsHMTL($a, $contact_id, $update, $parent = 0)
        {
                $o = '';
 
@@ -952,14 +952,15 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getByURL($contact['url'], false);
-
-                       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);
                        }
                }
 
@@ -975,7 +976,7 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getByURL($contact['url'], false);
+                       $profiledata = Model\Contact::getByURLForUser($contact['url'], local_user());
 
                        if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
                                $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);