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 7e27858a3b5102f101ad82982764c06dca9ac5e7..7f05786c8ee72072b5cbe73b2aca26f381a2f91a 100644 (file)
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -1,17 +1,33 @@
 <?php
-
 /**
- * @file src/Model/ItemURI.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 
 class ItemURI
 {
        /**
-        * @brief Insert an item-uri record and return its id
+        * Insert an item-uri record and return its id
         *
         * @param array $fields Item-uri fields
         *
@@ -24,21 +40,25 @@ 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'];
        }
 
        /**
-        * @brief Searched for an id of a given uri. Adds it, if not existing yet.
+        * Searched for an id of a given uri. Adds it, if not existing yet.
         *
         * @param string $uri
         *