AP: Debug option to deliver via AP first

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2b7aada795b97488bb3e79f6b3e96e64f7c3c6b9..cf90406e24a029d5afbc2cd83eceebfce9d95922 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -66,7 +66,7 @@ class Contact extends BaseObject
         */
 
        /**
-        * @name account types
+        * Account types
         *
         * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value
         *
@@ -662,7 +662,7 @@ class Contact extends BaseObject
        {
                if (!isset($contact['url']) && !empty($contact['id'])) {
                        $fields = ['id', 'url', 'archive', 'self', 'term-date'];
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
                        if (!DBA::isResult($contact)) {
                                return;
                        }
@@ -725,7 +725,7 @@ class Contact extends BaseObject
 
                if (!isset($contact['url']) && !empty($contact['id'])) {
                        $fields = ['id', 'url', 'batch'];
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
                        if (!DBA::isResult($contact)) {
                                return;
                        }
@@ -1753,7 +1753,7 @@ class Contact extends BaseObject
                        }
                } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
                        $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
-                       $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+                       $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        return $result;
                }