Merge pull request #10536 from annando/dfrn2

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

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 9af6100a0ac319b37992f967f6d5acbb9b3ca131..d7f1179d023d3fd03c52daff6098f6a58d5f13ab 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -81,7 +81,8 @@ class DBStructure
 
                $old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data',
                        'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule',
-                       'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item'];
+                       'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge',
+                       'auth_codes', 'clients', 'tokens', 'profile_check'];
 
                $tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'],
                        ['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
@@ -162,8 +163,6 @@ class DBStructure
 
        public static function writeStructure()
        {
-               Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
-
                $tables = [];
                foreach (self::definition(null) as $name => $definition) {
                        $indexes  = [[
@@ -1371,7 +1370,7 @@ class DBStructure
                        echo "permissionset: Table not found\n";
                }
 
-               if (!self::existsForeignKeyForField('tokens', 'client_id')) {
+               if (self::existsTable('tokens') && self::existsTable('clients') && !self::existsForeignKeyForField('tokens', 'client_id')) {
                        $tokens = DBA::p("SELECT `tokens`.`id` FROM `tokens`
                                LEFT JOIN `clients` ON `clients`.`client_id` = `tokens`.`client_id`
                                WHERE `clients`.`client_id` IS NULL");