Problems with group membership (3.10)

We have just migrated from 3.8 to 3.10.
We had a problem with the group membership: we could not add new members, and the list of members in a group was not filled in (also the group name was not filled in for the list).
We tracked this down to two files in website_code/php/management:

• We had to add a "global $xerte_toolkits_site;" to the function add_members_to_group in add_member.php
• We had to add a "global $xerte_toolkits_site;" to the function get_group_members in get_group_members.php, and rewrite the $query as it was not adding $xerte_toolkits_site->database_table_prefix to the front of table "user_group_members" - we had to adjust the WHERE conditions as a result.

We are using 3.10 (git v3.10.4-25-g6388a3f)
We are using a non-empty $xerte_toolkits_site->database_table_prefix;

Thank you for the description of the fixes. I'll implement those and push them to master.

I think there may also be problems of a related sort in the following:

• Line 60 in /website_code/php/properties/group_sharing_status_template.php : there should be a ${prefix} before the user_groups in "SELECT user_groups.group_id"
  
• Function nr_user_groups in /website_code/php/properties/properties_library.php : it needs a "global $xerte_toolkits_site;" and to stick $xerte_toolkits_site->database_table_prefix in front of the user_groups in the SQL statement.

I implemented all 4 fixes and I pushed those fixes to git and the update package on this website.