Merge pull request #9635 from MrPetovan/bug/notices

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

diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index 265585be7ba8f8dba3dceb89ac050d512c121a32..7f05786c8ee72072b5cbe73b2aca26f381a2f91a 100644 (file)
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 
 class ItemURI
@@ -39,16 +40,20 @@ class ItemURI
                $uri = substr($fields['uri'], 0, 255);
 
                if (!DBA::exists('item-uri', ['uri' => $uri])) {
-                       DBA::insert('item-uri', $fields, true);
+                       DBA::insert('item-uri', $fields, Database::INSERT_UPDATE);
                }
 
-               $itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]);
+               $itemuri = DBA::selectFirst('item-uri', ['id', 'guid'], ['uri' => $uri]);
 
                if (!DBA::isResult($itemuri)) {
                        // This shouldn't happen
                        return null;
                }
 
+               if (empty($itemuri['guid']) && !empty($fields['guid'])) {
+                       DBA::update('item-uri', ['guid' => $fields['guid']], ['id' => $itemuri['id']]);
+               }
+
                return $itemuri['id'];
        }