Apply changes to user-contact table first in Contact::update

- The truncateFieldsForTable call in the same method was potentially restricting the fields that could be updated in the user-contact table

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index e847ce034666cf458ce7121363127af7f5d8eac1..0f953a0b333b1af6ddd32674f7a2bb758db6983d 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -243,15 +243,13 @@ class Contact
         * @throws \Exception
         * @todo Let's get rid of boolean type of $old_fields
         */
-       public static function update(array $fields, array $condition, $old_fields = [])
+       public static function update(array $fields, array $condition, $old_fields = []): bool
        {
-               $fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
-               $ret = DBA::update('contact', $fields, $condition, $old_fields);
-
                // Apply changes to the "user-contact" table on dedicated fields
                Contact\User::updateByContactUpdate($fields, $condition);
 
-               return $ret;
+               $fields = DI::dbaDefinition()->truncateFieldsForTable('contact', $fields);
+               return DBA::update('contact', $fields, $condition, $old_fields);
        }
 
        /**