Merge pull request #12277 from nupplaphil/mod/fbrowser

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 82fe70e3f19be7c0ec625abef6a7bb559d953b41..adc88b13e82ec425edc0995724bc3a9bf04ef6bc 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -359,7 +359,7 @@ class PostUpdate
                 }
                        }
 
-                       Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url'], false);
+                       Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url']);
 
                        $id = $term['tid'];
                        ++$rows;
@@ -563,7 +563,7 @@ class PostUpdate
                $items = DBA::p("SELECT `item`.`id`, `item`.`verb` AS `item-verb`, `item-content`.`verb`, `item-activity`.`activity`
                        FROM `item` LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
                        LEFT JOIN `item-activity` ON `item-activity`.`uri-id` = `item`.`uri-id` AND `item`.`gravity` = ?
-                       WHERE `item`.`id` >= ? AND `item`.`vid` IS NULL ORDER BY `item`.`id` LIMIT 10000", GRAVITY_ACTIVITY, $id);
+                       WHERE `item`.`id` >= ? AND `item`.`vid` IS NULL ORDER BY `item`.`id` LIMIT 10000", Item::GRAVITY_ACTIVITY, $id);
 
                if (DBA::errorNo() != 0) {
                        Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
@@ -1040,6 +1040,11 @@ class PostUpdate
                        return true;
                }
 
+               if (!DBStructure::existsTable('conversation')) {
+                       DI::config()->set('system', 'post_update_version', 1452);
+                       return true;
+               }
+
                $id = DI::config()->get('system', 'post_update_version_1452_id', 0);
 
                Logger::info('Start', ['uri-id' => $id]);
@@ -1153,6 +1158,10 @@ class PostUpdate
 
                while ($contact = DBA::fetch($contacts)) {
                        $id = $contact['id'];
+                       if (is_null($contact['uri-id'])) {
+                               $contact['uri-id'] = ItemURI::getIdByURI($contact['url']);
+                               DBA::update('contact', ['uri-id' => $contact['uri-id']], ['id' => $contact['id']]);
+                       }
                        Contact::setAccountUser($contact['id'], $contact['uid'], $contact['uri-id'], $contact['url']);
                        ++$rows;
                }