Add support for legacy $lang config in App->loadConfig

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 0c8ff27faf894d576303bba0a30decf2d61e8ce3..b2781d5874a9afe794df0a3815211dc98439659a 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -44,6 +44,7 @@ class Delivery extends BaseObject
                                return;
                        }
                        $uid = $target_item['uid'];
+                       $items = [];
                } elseif ($cmd == self::SUGGESTION) {
                        $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
                        if (!DBM::is_result($target_item)) {
@@ -127,6 +128,10 @@ class Delivery extends BaseObject
                        }
                }
 
+               if (empty($items)) {
+                       logger('No delivery data for  ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
+               }
+
                $owner = User::getOwnerDataById($uid);
                if (!DBM::is_result($owner)) {
                        return;
@@ -259,6 +264,10 @@ class Delivery extends BaseObject
                                return;
                        }
 
+                       $user = dba::selectFirst('user', [], ['uid' => $target_uid]);
+
+                       $target_importer = array_merge($target_importer, $user);
+
                        // Set the user id. This is important if this is a public contact
                        $target_importer['importer_uid']  = $target_uid;
                        DFRN::import($atom, $target_importer);
@@ -267,7 +276,7 @@ class Delivery extends BaseObject
 
                // We don't have a relationship with contacts on a public post.
                // Se we transmit with the new method and via Diaspora as a fallback
-               if (($items[0]['uid'] == 0) || ($contact['uid'] == 0)) {
+               if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
                        // Transmit in public if it's a relay post
                        $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);