Multiple fields appearing on add member form when groups of more than one entity type exist

+++ b/og_ui/og_ui.admin.incundefined
@@ -163,6 +163,16 @@ function og_ui_add_users($form, &$form_state, $group_type, $gid) {
   $field_names = og_get_group_audience_fields();

How about moving this check to og_get_group_audience_fields().

#4: member-add-field-exception-1966748-4.patch queued for re-testing.

+++ b/og.moduleundefined
@@ -2254,11 +2254,13 @@ function og_is_group_audience_field($field_name) {
+ *  Filter list to only include fields of a specific group type.

Missing space.

+++ b/og.moduleundefined
@@ -2270,6 +2272,11 @@ function og_get_group_audience_fields($entity_type = 'user', $bundle_name = 'use
+    $field_info = field_info_field_by_id($instance['field_id']);

use field_info_field()

+++ b/og.moduleundefined
@@ -2277,6 +2279,11 @@ function og_get_group_audience_fields($entity_type = 'user', $bundle_name = 'use
+    ¶

Minor: Can you remove the spaces?

> witched to using field_info_field()

Core is using this, so following same pattern. field_info_field() is cached as-well.

Use Dreditor to see you patch

Committed, thanks.