"contact-id" has to be set, after "author-id" had been set

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 01c2c3459d848cb8288c6eaa5851653ef1de04cc..de500bd56d2fe8adaf30bd441bd64b9cb86fa9d1 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1471,9 +1471,6 @@ class Item extends BaseObject
 
                $item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
 
-               // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
-               $item["contact-id"] = self::contactId($item);
-
                $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
                        'photo' => $item['author-avatar'], 'network' => $item['network']];
 
@@ -1529,6 +1526,9 @@ class Item extends BaseObject
                unset($item['causer-id']);
                unset($item['causer-link']);
 
+               // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
+               $item["contact-id"] = self::contactId($item);
+
                if ($item['network'] == Protocol::PHANTOM) {
                        $item['network'] = Protocol::DFRN;
                        Logger::notice('Missing network, setting to {network}.', [