From b9811f1bef2196bc59d6ff225e7399483c72faf0 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 11 Jun 2018 13:22:08 +0000 Subject: [PATCH] Fix: Avoid endlessly dbstructure changes --- src/Database/DBStructure.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 900e00b521..d4419553c4 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -322,8 +322,8 @@ class DBStructure $parameters['comment'] = ""; } - $current_field_definition = implode(",", $field_definition); - $new_field_definition = implode(",", $parameters); + $current_field_definition = dba::clean_query(implode(",", $field_definition)); + $new_field_definition = dba::clean_query(implode(",", $parameters)); if ($current_field_definition != $new_field_definition) { $sql2 = self::modifyTableField($fieldname, $parameters); if ($sql3 == "") { @@ -1074,7 +1074,7 @@ class DBStructure "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["group" => "id"], "comment" => "groups.id of the associated group"], - "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"], + "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"], ], "indexes" => [ "PRIMARY" => ["id"],